Merge pull request #14 from localgeohistoryproject/develop

Version 2.1.0

CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## [2.1.0] - 2024-10-09
+
+### Added
+
+- Database column hassource to views extra.governmentsourceextra and extra.governmentsourceextracache.
+- Database column plsstownshipname to geohistory.plsstownship.
+- Database views extra.recordingextra and extra.recordingextracache.
+- Functionality to accommodate changes to related private repositories.
+- Google Analytics support.
+
+### Changed
+
+- CodeIgniter from 4.5.2 to 4.5.5.
+- Controller properties and view calls to remove $this->data array; pass model results directly in more situations.
+- CSS and HTML tag id references.
+- Database column documentationshort in geohistory.documentation to lengthen field.
+- Database extract pg_dump and OS versions.
+- Database function extra.governmentindigobook(integer) to cover additional scenarios.
+- DataTables from 2.0.8 to 2.1.8.
+- Dockerfile to accommodate changes to related private repositories.
+- Dockerfiles to remove globs and reconfigure folder structure for environment-specific files.
+- MapLibre GL JS from 4.4.1 to 4.7.1.
+- MapLibre GL Leaflet from 0.0.21 to 0.0.22.
+- PHP CS Fixer from 3.59.3 to 3.64.0.
+- PHP docker image from 8.2.11-apache to php:8.3.11-apache.
+- PHPStan Extension Installer from 1.4.1 to 1.4.3.
+- PHPStan from 1.11.5 to 1.12.6.
+- PHPStan Strict Rules from 1.6.0 to 1.6.1.
+- PMTiles from 3.0.6 to 3.2.0.
+- README to update installation instructions to accommodate Ubuntu 24.04 LTS, and remove other OS warning.
+- Rector from 1.1.0 to 1.2.6.
+
+### Fixed
+
+- App\Filters\LanguageRedirect to accommodate classes without a getLocale method.
+- Functionality to accommodate changes to related private repositories.
+- GovernmentModel->getAbbreviationid(string) to force uppercase comparison and output proper response column.
+
+### Removed
+
+- Database extract exclusion warnings from comments for columns recordingrepositoryitemfrom and recordingrepositoryitemto in geohistory.recording.
+- Disclaimer text and venue environmental variables from repository (to be stored in Open Data repository).
+- PHPStan review of certain development directories.
+
 ## [2.0.2] - 2024-06-20
 
 ### Changed
@@ -273,6 +317,7 @@
 
 - Public release of the Local Geohistory Project: Application repository.
 
+[2.1.0]: https://github.com/localgeohistoryproject/application/compare/v2.0.2...v2.1.0
 [2.0.2]: https://github.com/localgeohistoryproject/application/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/localgeohistoryproject/application/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/localgeohistoryproject/application/compare/v1.2.2...v2.0.0

README.md

@@ -17,7 +17,7 @@ These instructions were created using Ubuntu; however, URLs to software instruct
 Several components must be installed to build the application. On Ubuntu, run the following code via Terminal:
 
 ```bash
-sudo apt-get install git docker docker-compose
+sudo apt-get install git docker.io docker-compose-v2
 ```
 
 More detailed installation instructions for Docker and Docker Compose are available at:
@@ -53,7 +53,7 @@ The application uses symbolic links to propagate the .env file to 2 other locati
 src/.env
 ```
 
-The application also contains 2 Dockerfiles, one in **docker/php** and one in **docker/postgis**, which may need to be modified in other operating systems where COPY statements will fail if the file does not exist. In these situations, uncomment the line starting with **COPY** that is immediately below the line starting with **# OTHER OPERATING SYSTEMS** by removing **#** from the beginning of the line, and then go to the following **COPY** line and add **#** to the beginning of the line to comment it out.
+The application also contains 2 Dockerfiles, one in **docker/php** and one in **docker/postgis**.
 
 ### Copy data files into the inpostgis folder
 
@@ -64,7 +64,7 @@ The **inpostgis** folder contains 2 SQL files containing the structural elements
 The final step to deploying the application is to build it using Docker Compose. Run the following command using a program such as Command Prompt (Windows), Git BASH, or Terminal:
 
 ```bash
-sudo docker-compose up --detach
+sudo docker compose up --detach
 ```
 
 ### Check installation

docker-compose.yaml

@@ -6,6 +6,8 @@ services:
             dockerfile: ./docker/php/Dockerfile
             args:
                 CI_ENVIRONMENT: ${CI_ENVIRONMENT}
+                DOCKER_PHP: ${DOCKER_PHP}
+                DOCKER_PHP_PERSONAL: ${DOCKER_PHP_PERSONAL}
         restart: always
         environment:
             TZ: ${TZ}
@@ -28,6 +30,8 @@ services:
         build:
             context: ./
             dockerfile: ./docker/postgis/Dockerfile
+            args:
+                DOCKER_POSTGIS: ${DOCKER_POSTGIS}
         restart: always
         command:
           - "postgres"

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.2.11-apache
+FROM php:8.3.11-apache
 # Create writable dictory for CodeIgniter
 RUN mkdir /writable
 RUN mkdir /writable/cache
@@ -20,15 +20,15 @@ RUN install-php-extensions gd intl pgsql xsl zip
 # Adjust configuration files
 COPY /docker/php/mods-enabled/headers.conf /etc/apache2/mods-enabled/
 RUN mkdir /usr/src/docker
-# OTHER OPERATING SYSTEMS: May need to use the commented version below instead of the uncommented version 2 lines down
-# COPY ./docker/php/import_common_php.sh ./docker/php/import_dependency.sh /usr/src/docker/
-COPY ./docker/php/import_common_php.sh ./docker/php/import_dependency.sh ./src/private/development/docker/import_developmen[t]_php.sh ./src/private/production/docke[r]/* ./src/private/personal-production/personal-docke[r]/* /usr/src/docker/
+ARG DOCKER_PHP
+ARG DOCKER_PHP_PERSONAL
+COPY /docker/php/import_common_php.sh /docker/php/import_dependency.sh /src/private/${DOCKER_PHP}/docker/* /src/private/${DOCKER_PHP_PERSONAL}/docker/* /usr/src/docker/
 RUN chmod -R 764 /usr/src/docker/*
 ARG CI_ENVIRONMENT
+RUN apt-get update
+RUN apt-get install -y unzip zip
 RUN /usr/src/docker/import_common_php.sh
 # Restart Apache
 RUN service apache2 restart
 # Install Composer and prerequisites
-RUN apt-get update
-RUN apt-get install -y unzip zip
 COPY --from=composer:2.6.5 /usr/bin/composer /usr/bin/composer

docker/php/import_dependency.sh

@@ -15,8 +15,7 @@ curl -s -S -o "${license_folder}/D3.txt" "https:/${dependency_d3}/../LICENSE"
 
 curl -s -S -o ${asset_folder}/css/dataTables.dataTables.min.css "https:/${dependency_datatables}/css/dataTables.dataTables.min.css"
 curl -s -S -o ${asset_folder}/js/dataTables.min.js "https:/${dependency_datatables}/js/dataTables.min.js"
-curl -s -S -o "${license_folder}/DataTables.html" "https://datatables.net/license/"
-curl -s -S -o "${license_folder}/DataTables-MIT.html" "https://datatables.net/license/mit"
+curl -s -S -o "${license_folder}/DataTables.txt" "https:/${dependency_datatables_license}"
 
 curl -s -S --output-dir ${asset_folder} -O "https:/${dependency_html_to_image}/html-to-image.js"
 curl -s -S -o "${license_folder}/Html to Image.txt" "https:/${dependency_html_to_image}/../LICENSE"

docker/postgis/Dockerfile

@@ -7,9 +7,8 @@ RUN git clone -b v1.1.1 https://github.com/aws/pg_tle.git /tmp/pg_tle/
 RUN make -C /tmp/pg_tle/
 RUN make -C /tmp/pg_tle/ install
 # Copy scripts and imports to launch database
-# OTHER OPERATING SYSTEMS: May need to use the commented version below instead of the uncommented version 2 lines down
-# COPY ./docker/postgis/import_common_postgis.sh ./docker/postgis/import_production_postgis.sh /docker-entrypoint-initdb.d/
-COPY ./docker/postgis/import_common_postgis.sh ./docker/postgis/import_production_postgis.sh ./src/private/development/docker/import_developmen[t]_postgis.sh /docker-entrypoint-initdb.d/
+ARG DOCKER_POSTGIS
+COPY /docker/postgis/import_common_postgis.sh /src/private/${DOCKER_POSTGIS}/docker/import_env_postgis.sh /docker-entrypoint-initdb.d/
 RUN mkdir /tmp/inpostgis/
 RUN chmod -R 777 /tmp/inpostgis/
 RUN rm -rf /docker-entrypoint-initdb.d/10_postgis.sh

env/Sample.env

@@ -20,6 +20,21 @@
 
 CI_ENVIRONMENT=production
 
+# Folder within /src/private/ where environment-specific
+# files are located for PHP import
+
+DOCKER_PHP=default
+
+# Folder within /src/private/ where environment-specific
+# files are located for PHP personal import
+
+DOCKER_PHP_PERSONAL=personal-default
+
+# Folder within /src/private/ where environment-specific
+# files are located for PostGIS import
+
+DOCKER_POSTGIS=default
+
 # Default time zone (Eastern Time Zone, United States)
 
 TZ=America/New_York
@@ -58,14 +73,6 @@ app_title_en=***
 
 app_title_fr=***
 
-# Venue under Governing Law in Disclaimers.
-
-app_venue_county=***
-
-app_venue_state=***
-
-app_venue_country=***
-
 # Name and contact information in the footer and Disclaimers.
 
 app_compiler_name=***
@@ -191,7 +198,9 @@ dependency_classybrew=unpkg.com/[email protected]/src
 
 dependency_d3=unpkg.com/[email protected]/dist
 
-dependency_datatables=cdn.datatables.net/2.0.8
+dependency_datatables=cdn.datatables.net/2.1.8
+
+dependency_datatables_license=raw.githubusercontent.com/DataTables/DataTablesSrc/refs/tags/2.1.8/license.txt
 
 dependency_html_to_image=unpkg.com/[email protected]/dist
 
@@ -201,11 +210,11 @@ dependency_leaflet=unpkg.com/[email protected]/dist
 
 dependency_leaflet_fullscreen=unpkg.com/[email protected]/dist
 
-dependency_maplibre_gl=unpkg.com/maplibre-gl@4.4.1/dist
+dependency_maplibre_gl=unpkg.com/maplibre-gl@4.7.1/dist
 
-dependency_maplibre_gl_leaflet=unpkg.com/@maplibre/[email protected].21
+dependency_maplibre_gl_leaflet=unpkg.com/@maplibre/[email protected].22
 
-dependency_pmtiles=unpkg.com/pmtiles@3.0.6/dist
+dependency_pmtiles=unpkg.com/pmtiles@3.2.0/dist
 
 dependency_selectize=unpkg.com/[email protected]/dist