geovisio 2.6.0__tar.gz → 2.7.1__tar.gz

{geovisio-2.6.0 → geovisio-2.7.1}/.dockerignore

@@ -4,8 +4,11 @@
 !/pyproject.toml
 !/README.md
 !/LICENSE
+!/Makefile
 !/geovisio/**/*.py
 !/geovisio/**/*.html
+!/geovisio/**/*.po
+!/geovisio/**/*.pot
 !/docker/docker-entrypoint.sh
 !/images/*
 !/migrations/*.sql

{geovisio-2.6.0 → geovisio-2.7.1}/.gitignore

@@ -10,3 +10,4 @@ config.py
 docker/models/
 .vscode/
 site/
+*.mo

{geovisio-2.6.0 → geovisio-2.7.1}/.gitlab-ci.yml

@@ -2,7 +2,7 @@ variables:
   DOCKER_BUILDKIT: 1 # use buildkit for better performance
   DOCKER_DRIVER: overlay2 # better docker driver to avoid copying too many files on each run
   GITLAB_REGISTRY: registry.gitlab.com # We use docker.io for official images and gitlab's registry to store temporary images
-  DOCKER_IMAGE_NAME: geovisio/api
+  DOCKER_IMAGE_NAME: panoramax/api
   REPO_NAME: panoramax/server/api
   CI_IMAGE_CACHE: $GITLAB_REGISTRY/$REPO_NAME:build_cache
   DOCKER_TLS_CERTDIR: ""
@@ -19,7 +19,7 @@ code-fmt:
   stage: test
   only:
       - merge_requests
-  image: python:3.9-alpine
+  image: python:3.10-alpine
   script:
     - pip install black
     - black --fast --check .
@@ -35,7 +35,7 @@ test-in-docker:
   image: docker:latest
   services:
       - docker:dind
-      - postgis/postgis:latest
+      - postgis/postgis:15-3.4
   variables:
     POSTGRES_DB: geovisio_test
     POSTGRES_USER: geovisio
@@ -79,9 +79,9 @@ test:
     - when: on_success
 
   stage: test
-  image: python:3.9
+  image: python:3.10
   services:
-      - postgis/postgis:latest
+      - postgis/postgis:15-3.4
   variables:
       PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
       POSTGRES_DB: geovisio_test
@@ -93,38 +93,13 @@ test:
       FS_PERMANENT_URL: "/tmp/geovisio_test/permanent/"
       FS_DERIVATES_URL: "/tmp/geovisio_test/derivates/"
   script:
+      - apt update && apt install -y gettext
       - mkdir -p /tmp/geovisio_test/tmp /tmp/geovisio_test/derivates /tmp/geovisio_test/permanent
       - pip install -e .[dev]
+      - make i18n-po2code
       - pytest -vv -m "not skipci"
 
 
-test-api-conformance:
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - when: on_success
-
-  stage: test
-  image: python:3.10
-  services:
-      - postgis/postgis:latest
-  variables:
-      PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-      POSTGRES_DB: geovisio_test
-      POSTGRES_USER: geovisio
-      POSTGRES_PASSWORD: geovisiopass
-      POSTGRES_HOST_AUTH_METHOD: trust
-      DB_URL: "postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgis-postgis/$POSTGRES_DB"
-      FS_TMP_URL: "/tmp/geovisio_test/tmp/"
-      FS_PERMANENT_URL: "/tmp/geovisio_test/permanent/"
-      FS_DERIVATES_URL: "/tmp/geovisio_test/derivates/"
-  script:
-      - apt update && apt install -y wget jq
-      - mkdir -p /tmp/geovisio_test/tmp /tmp/geovisio_test/derivates /tmp/geovisio_test/permanent
-      - pip install .[dev,api-conformance]
-      - ./tests/test_api_conformance.sh
-
-
 publish-develop:
   rules:
     # run job only for fork that have the credentials to pull images from the gitlab-registry
@@ -136,7 +111,7 @@ publish-develop:
   image: docker:latest
   services:
       - docker:dind
-      - postgis/postgis:latest
+      - postgis/postgis:15-3.4
   variables:
       POSTGRES_DB: geovisio_test
       POSTGRES_USER: geovisio
@@ -155,10 +130,8 @@ publish-develop:
       --cache-from "type=registry,ref=$CI_IMAGE_CACHE"
       --cache-to "type=registry,mode=max,ref=$CI_IMAGE_CACHE"
       --tag "$DOCKER_IMAGE_NAME:develop"
-      --label "org.opencontainers.image.title=$CI_PROJECT_TITLE"
-      --label "org.opencontainers.image.url=$CI_PROJECT_URL"
-      --label "org.opencontainers.image.created=$CI_JOB_STARTED_AT"
-      --label "org.opencontainers.image.revision=$CI_COMMIT_SHORT_SHA"
+      --build-arg GIT_DESCRIBE=$GIT_DESCRIBE
+      --build-arg BUILD_DATE=$CI_JOB_STARTED_AT
       --load
       --progress=plain
       .
@@ -183,7 +156,7 @@ publish-tag-and-latest:
   image: docker:latest
   services:
       - docker:dind
-      - postgis/postgis:latest
+      - postgis/postgis:15-3.4
   variables:
       POSTGRES_DB: geovisio_test
       POSTGRES_USER: geovisio
@@ -203,10 +176,8 @@ publish-tag-and-latest:
       --cache-to "type=registry,mode=max,ref=$CI_IMAGE_CACHE"
       --tag "$DOCKER_IMAGE_NAME:$CI_COMMIT_REF_NAME"
       --tag "$DOCKER_IMAGE_NAME:latest"
-      --label "org.opencontainers.image.title=$CI_PROJECT_TITLE"
-      --label "org.opencontainers.image.url=$CI_PROJECT_URL"
-      --label "org.opencontainers.image.created=$CI_JOB_STARTED_AT"
-      --label "org.opencontainers.image.revision=$GIT_DESCRIBE"
+      --build-arg GIT_DESCRIBE=$GIT_DESCRIBE
+      --build-arg BUILD_DATE=$CI_JOB_STARTED_AT
       --load
       --progress=plain
       .
@@ -227,27 +198,9 @@ publish-on-pypi:
   only:
     - tags
   stage: deploy
-  image: python:3.9
+  image: python:3.10
   script:
+    - apt update && apt install -y gettext
     - pip install .[build]
+    - make i18n-po2code
     - flit publish # use [flit](https://flit.pypa.io/) and FLIT_USERNAME/FLIT_PASSWORD env var
-
-pages:
-  stage: deploy
-  only:
-    - develop
-  image: python:3.9
-  variables:
-      PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-  cache:
-      paths:
-          - $PIP_CACHE_DIR
-  variables:
-      CI: 1
-  script:
-      - pip install -e .[docs]
-      - mkdocs build --strict
-  artifacts:
-      paths:
-          - site
-  publish: site

{geovisio-2.6.0 → geovisio-2.7.1}/CHANGELOG.md

@@ -9,7 +9,77 @@ Before _1.6.0_, [Viewer](https://gitlab.com/panoramax/clients/web-viewer) was em
 
 ## [Unreleased]
 
-## [2.6.0] - 2024-03-07
+## [2.7.1] - 2024-11-15
+
+### Added
+
+- Routes returning items/pictures have the `pers:interior_orientation/sensor_array_dimensions` property set, letting users know about original picture dimensions (width/height).
+- Add number and coefficient of 360° pictures to the pictures grid. This will makes it possible to display a grid of only 360° pictures.
+- Add `missing_fields` list to the `/api/upload_sets/:id/files` response detailling the missing fields from a rejected uploaded picture.
+- Details about picture quality are now offered for display and filtering:
+  - In sequences and pictures routes: `quality:horizontal_accuracy` for GPS position precision (in meters), `panoramax:horizontal_pixel_density` for pixel density on horizon (px/FOV degree).
+  - In vector tiles: `gps_accuracy` and `h_pixel_density` (for __sequences and pictures__ layers, not available on grid layer)
+- In vector tiles style, a new metadata property `panoramax:fields` lists all available properties in each layer (pictures, sequences, grid). This will allow easier compatibility checks in web viewer.
+- Translations in Spanish 🇪🇸 and Hungarian 🇭🇺.
+
+### Changed
+
+- In vector tiles, grid layer is now returning circles instead of polygons. Map style is also adapted for a smoother transition on low zooms (for a heatmap-like effect).
+- More EXIF tags are stripped out of database, to reduce used disk space: all keys containing hexadecimal sub-keys are removed (like `Exif.Sony.0x1234`). These fields are still available in original pictures files. A database migration removes them from existing pictures stock in your database (and could possibly take a bit of time to run...). After migration, you may want to run a little `VACUUM` to reclaim disk space.
+- Add number and coefficient of 360° pictures to the pictures grid. This will makes it possible to display a grid of only 360° pictures.
+- Change the way deleted pictures/upload_sets are handled, objects are removed from the database sooner than before, without needing a flag to tell that the underlying files needed deletion.
+
+### Fixed
+
+- The rejection reason of duplicate files is now `file_duplicate` instead of `invalid_metadata`.
+- Fix a bug when loading a picture with a focal length of 0.
+
+## [2.7.0] - 2024-10-10
+
+⚠️ The minimal supported Python version is now 3.10. Note that you can run it with newer python versions as some might bring better performance. ⚠
+
+### Added
+
+- The API and picture workers now use connection pool to reduce the load on the database and improve the performances. The connection pool can be configured using `DB_MIN_CNX`/`DB_MAX_CNX`.
+- Add a way to use Gunicorn instead of waitress as WSGI server. Gunicorn can use processes instead of threads, which can result in better performance for high load usage.
+- The ID of the associated accounts are now returned in the STAC response in an `id` field in the `providers` field.
+- Add a whole new way of uploading pictures, using the new `/api/upload_sets` APIs. The pictures added to the uploaded will be dispatched to one or more collection on completion.
+- You can create and manage _Reports_ (issues with pictures or sequences) through `/api/reports` routes. Reports can be created anonymously or by authenticated users, can automatically hide faulty pictures or sequences, and be tracked over time for statistics. **Note** that reports management (beyond creation, which can be done through _web viewer_) is only available through HTTP API as now, no CLI or front-end is offered as now.
+- You can create and manage _Excluded areas_ (areas where people should not upload pictures) through `/api/configuration/excluded_areas` and `/api/users/me/excluded_areas` routes. Excluded areas can be defined for everyone, or by user, for fine management. **Note** that this is only manageable through HTTP API, no CLI or front-end is offered as now.
+- An user account can be marked with an `admin` role in database to enable some features (access to all reports, edit excluded areas).
+- Support of cropped panorama, with new values in `pers:interior_orientation` in picture properties: `visible_area`, `sensor_array_dimensions` following [proposed definition in STAC](https://github.com/stac-extensions/perspective-imagery/issues/10).
+- Routes `/api` and `/api/configuration` return API version in a `geovisio_version` attribute (example: `2.6.0-12-ab12cd34`).
+- Routes returning collections display a `geovisio:upload-software` property showing which client has been used to create the collection (for meta-catalog statistics).
+- Handle user agent `GeoVisioCli` and `PanoramaxCli` as the same `cli` software.
+
+### Changed
+
+- Flask session has been set to `permanent`, thus the session cookie will have the lifetime defined by `FLASK_PERMANENT_SESSION_LIFETIME` (default to 7 days).
+- Reject duplicates pictures (same md5). A configuration `API_ACCEPT_DUPLICATE` can make the instance accepts duplicates as before.
+- The background jobs have been changed, it should be transparent for the administrator, but they now rely on the new `job_queue` table, and can handle more types of async jobs.
+- More metadata can be set on API (name, description, logo and main color) in `API_SUMMARY` setting. This is served through `/api/configuration` and `/api` routes for client-side display.
+- Maximum authorized distance between two consecutive pictures in a same segment of a sequence is now 75 meters (distance at 135km/h during two seconds). This only changes map rendering, to avoid sequences cuts over motorways.
+- Sequences and Upload Sets creation now stores `User-Agent` HTTP requests headers.
+- Minimal required PostGIS version is now 3.4 with PostgreSQL 12.
+- Almost all database queries now have a statement timeout (default to 5mn).
+- Updated Geopic Tag Reader to 1.3.0 to solve various issues related to pictures timestamps.
+- In vector tiles style, `interpolate-hcl` expression for grid colouring has been replaced into `interpolate` for broader compatibility with QGIS versions.
+- A new `geovisio:length_km` property is available on `/api/collections/:id`, `/api/users/:id/collection` and `/api/users/me/collection` route, giving the length of sequence in kilometers.
+- ⚠️ The docker images are now `panoramax/api` instead of `geovisio/api`.
+
+### Fixed
+
+- RSS feed was producing invalid viewer links (missing coordinates) since sequences are represented as MultiLineString in database.
+- Fix a bug where we could add pictures to an already deleted sequence.
+- Fix a bug where the `pictures_grid` view was refreshed too frequently (and the computation can be expensive for the database).
+
+### Removed
+
+- The `test-api-conformance.sh` are now regular python tests
+- Removed on-the-fly JPEG to WebP conversion (too slow). WebP might do an unexpected come-back in the future 😉
+- The list of users has been removed from the API entrypoint (`/`) as the list is ever growning, but it can still be accessed through the `/users` endpoint.
+
+## [2.6.0] - 2024-05-17
 
 ⚠️ Important Note: This version add several quite long migrations. After the migration are run, you should run as a database administrator:
 
@@ -502,7 +572,9 @@ FLASK_APP="src" flask process-sequences
 - Viewer based on Photo Sphere Viewer automatically calling API to search and retrieve pictures
 - Dockerfile for easy server setup
 
-[Unreleased]: https://gitlab.com/panoramax/server/api/-/compare/2.6.0...develop
+[Unreleased]: https://gitlab.com/panoramax/server/api/-/compare/2.7.1...develop
+[2.7.1]: https://gitlab.com/panoramax/server/api/-/compare/2.7.0...2.7.1
+[2.7.0]: https://gitlab.com/panoramax/server/api/-/compare/2.6.0...2.7.0
 [2.6.0]: https://gitlab.com/panoramax/server/api/-/compare/2.5.0...2.6.0
 [2.5.0]: https://gitlab.com/panoramax/server/api/-/compare/2.4.0...2.5.0
 [2.4.0]: https://gitlab.com/panoramax/server/api/-/compare/2.3.1...2.4.0

geovisio-2.7.1/Dockerfile

@@ -0,0 +1,55 @@
+FROM python:3.11-slim
+
+# Stable metadata
+LABEL org.opencontainers.image.title="GeoVisio API"
+LABEL org.opencontainers.image.description="Panoramax is a digital resource for sharing and using field photos. GeoVisio API is the backend part of the ecosystem."
+LABEL org.opencontainers.image.authors="Adrien PAVIE <panieravide@riseup.net>"
+LABEL org.opencontainers.image.source="https://gitlab.com/panoramax/server/api.git"
+LABEL org.opencontainers.image.documentation="https://docs.panoramax.fr/api/"
+LABEL org.opencontainers.image.vendor="Panoramax"
+LABEL org.opencontainers.image.licenses="MIT"
+LABEL org.opencontainers.image.url="https://panoramax.fr/"
+
+# Install system dependencies
+# and create a `geovisio` user, to run the app as non root user
+RUN apt update \
+    && apt install -y git gettext make \
+    && pip install waitress gunicorn Babel \
+    && rm -rf /var/lib/apt/lists/* \
+    && mkdir -p /opt/geovisio /data/geovisio \
+    && groupadd --gid 1000 geovisio \
+    && useradd --uid 1000 --gid 1000 -m geovisio \
+    && chown -R geovisio:geovisio /opt/geovisio /data/geovisio
+
+WORKDIR /opt/geovisio
+USER geovisio
+
+# Install Python dependencies
+COPY ./README.md ./LICENSE ./pyproject.toml ./
+COPY ./geovisio/__init__.py ./geovisio/
+RUN pip install -e . --user
+
+# Add source files
+COPY ./images ./images/
+COPY ./docker/docker-entrypoint.sh ./
+COPY ./geovisio ./geovisio
+COPY ./migrations ./migrations
+COPY ./Makefile ./
+
+# Generate i18n compiled files
+USER root
+RUN make i18n-po2code
+USER geovisio
+
+# Retrieve build metadata
+ARG GIT_DESCRIBE
+LABEL org.opencontainers.image.revision=$GIT_DESCRIBE
+
+# Environment variables
+ENV FLASK_APP=geovisio
+ENV FS_URL="/data/geovisio"
+ENV API_GIT_VERSION=$GIT_DESCRIBE
+
+# Expose service
+EXPOSE 5000
+ENTRYPOINT ["./docker-entrypoint.sh"]

geovisio-2.7.1/Makefile

@@ -0,0 +1,35 @@
+.DEFAULT_GOAL := help
+
+.PHONY: run-all-compose
+
+run-all-compose:  ## Run all services with docker compose
+	docker-compose -f docker/docker-compose-full.yml up
+
+fmt:	## Run code formatting
+	black .
+
+generate-swagger:  ## Generate swagger documentation
+	FS_URL=/tmp flask -e test.env generate-api-schema > docs/api/open_api.json
+
+generate-doc: generate-swagger ## Generate mkdocs documentation
+	mkdocs build --strict
+
+serve-doc: generate-swagger ## Serve mkdocs documentation
+	mkdocs serve
+
+help: ## Print this help message
+	@grep -E '^[a-zA-Z_-]+:.*## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+i18n-code2pot:
+	pybabel extract -F babel.cfg -o geovisio/translations/messages.pot geovisio/
+	msginit --locale=en --no-translator --input=geovisio/translations/messages.pot --output=geovisio/translations/en/LC_MESSAGES/messages.po
+
+i18n-po2code:
+	pybabel compile -d geovisio/translations/
+
+build-docker:
+	docker buildx build \
+		--build-arg GIT_DESCRIBE=`git describe` \
+		--label=org.opencontainers.image.created=`date -u +'%Y-%m-%dT%H:%M:%SZ'` \
+		--label=org.opencontainers.image.version=`cat geovisio/__init__.py | grep -e '^__version__' | cut -d \" -f 2` \
+		-t panoramax/api:develop .

{geovisio-2.6.0 → geovisio-2.7.1}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: geovisio
-Version: 2.6.0
+Version: 2.7.1
 Summary: GeoVisio API - Main
 Author-email: Adrien PAVIE <panieravide@riseup.net>, Antoine Desbordes <antoine.desbordes@gmail.com>
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: Flask ~= 2.3
@@ -20,43 +20,46 @@ Requires-Dist: psycopg-binary ~= 3.1
 Requires-Dist: python-dotenv ~= 0.21
 Requires-Dist: authlib ~= 1.2
 Requires-Dist: Flask-Executor ~= 1.0
-Requires-Dist: geopic-tag-reader[write-exif] ~= 1.1.1
+Requires-Dist: geopic-tag-reader[write-exif] == 1.3.1
 Requires-Dist: rfeed ~= 1.1.1
 Requires-Dist: sentry-sdk[flask] ~= 1.31
-Requires-Dist: pygeofilter[backend-native] ~= 0.2.1
+Requires-Dist: pygeofilter[backend-native] ~= 0.2.4
 Requires-Dist: python-dateutil ~= 2.8.2
 Requires-Dist: tzdata ~= 2024.1
 Requires-Dist: croniter ~= 2.0.5
-Requires-Dist: geovisio_cli ~= 0.3.12 ; extra == "api-conformance"
-Requires-Dist: openapi-spec-validator ~= 0.7 ; extra == "api-conformance"
-Requires-Dist: jq ~= 1.7 ; extra == "api-conformance"
+Requires-Dist: pydantic ~= 2.7
+Requires-Dist: pydantic-extra-types ~= 2.7
+Requires-Dist: flask-babel ~= 4.0.0
+Requires-Dist: geojson-pydantic ~= 1.1.0
 Requires-Dist: flit ~= 3.9.0 ; extra == "build"
 Requires-Dist: coverage ~= 6.5 ; extra == "dev"
 Requires-Dist: protobuf ~= 4.21 ; extra == "dev"
 Requires-Dist: mapbox-vector-tile ~= 2.0 ; extra == "dev"
 Requires-Dist: pystac ~= 1.9 ; extra == "dev"
-Requires-Dist: pytest ~= 6.2 ; extra == "dev"
+Requires-Dist: pytest ~= 8.3 ; extra == "dev"
 Requires-Dist: pytest-datafiles ~= 2.0 ; extra == "dev"
-Requires-Dist: pyexiv2 ~= 2.8 ; extra == "dev"
+Requires-Dist: pyexiv2 ~= 2.15 ; extra == "dev"
 Requires-Dist: testcontainers ~= 4.1 ; extra == "dev"
 Requires-Dist: requests-mock ~= 1.11 ; extra == "dev"
 Requires-Dist: black ~= 24.1 ; extra == "dev"
 Requires-Dist: pre-commit ~= 3.3 ; extra == "dev"
 Requires-Dist: pyyaml ~= 6.0 ; extra == "dev"
+Requires-Dist: openapi-spec-validator ~= 0.7 ; extra == "dev"
+Requires-Dist: stac-api-validator ~= 0.6.3 ; extra == "dev"
 Requires-Dist: mkdocs-material ~= 9.5.21 ; extra == "docs"
+Requires-Dist: mkdocs-swagger-ui-tag ~= 0.6.10 ; extra == "docs"
 Project-URL: Home, https://gitlab.com/panoramax/server/api
 Project-URL: Source Code, https://gitlab.com/panoramax/server/api
-Provides-Extra: api-conformance
 Provides-Extra: build
 Provides-Extra: dev
 Provides-Extra: docs
 
 # ![Panoramax](https://upload.wikimedia.org/wikipedia/commons/thumb/a/a9/Panoramax.svg/40px-Panoramax.svg.png) Panoramax
 
-__Panoramax__ is a digital resource for sharing and exploiting 📍📷 field photos. Anyone can take photographs of places visible from the public streets and contribute them to the Panoramax database. This data is then freely accessible and reusable by all. More information available at [gitlab.com/panoramax](https://gitlab.com/panoramax) and [panoramax.fr](https://panoramax.fr/).
+__Panoramax__ is a digital resource for sharing and using 📍📷 field photos. Anyone can take photographs of places visible from the public streets and contribute them to the Panoramax database. This data is then freely accessible and reusable by all. More information available at [gitlab.com/panoramax](https://gitlab.com/panoramax) and [panoramax.fr](https://panoramax.fr/).
 
 
-# 🌐 GeoVisio API
+# 🌐 Panoramax API
 
 This repository only contains __the backend and web API__ of a Panoramax instance.
 
@@ -74,7 +77,7 @@ This repository only contains __the backend and web API__ of a Panoramax instanc
 
 ## Install & run
 
-Our [documentation](https://gitlab.com/panoramax/server/api/-/tree/develop/docs) will help you install, configure and run a GeoVisio instance.
+Our [documentation](https://gitlab.com/panoramax/server/api/-/tree/develop/docs) will help you install, configure and run a Panoramax instance.
 
 If at some point you're lost or need help, you can contact us through [issues](https://gitlab.com/panoramax/server/api/-/issues) or by [email](mailto:panieravide@riseup.net).
 

{geovisio-2.6.0 → geovisio-2.7.1}/Procfile

@@ -1,4 +1,4 @@
-web: DB_CHECK_SCHEMA=false python3 -m waitress --port $PORT --url-scheme=https --threads=${NB_API_THREADS:-4} --trusted-proxy '*' --trusted-proxy-headers 'X-Forwarded-For X-Forwarded-Host X-Forwarded-Port X-Forwarded-Proto' --log-untrusted-proxy-headers --clear-untrusted-proxy-headers --call 'geovisio:create_app'
+web: bin/run_production_api.sh
 
 # After having poped the API, we upgrade the database schema
 # If the postdeploy fails, scalingo will not expose the new app, and will keep the old one

{geovisio-2.6.0 → geovisio-2.7.1}/README.md

@@ -1,9 +1,9 @@
 # ![Panoramax](https://upload.wikimedia.org/wikipedia/commons/thumb/a/a9/Panoramax.svg/40px-Panoramax.svg.png) Panoramax
 
-__Panoramax__ is a digital resource for sharing and exploiting 📍📷 field photos. Anyone can take photographs of places visible from the public streets and contribute them to the Panoramax database. This data is then freely accessible and reusable by all. More information available at [gitlab.com/panoramax](https://gitlab.com/panoramax) and [panoramax.fr](https://panoramax.fr/).
+__Panoramax__ is a digital resource for sharing and using 📍📷 field photos. Anyone can take photographs of places visible from the public streets and contribute them to the Panoramax database. This data is then freely accessible and reusable by all. More information available at [gitlab.com/panoramax](https://gitlab.com/panoramax) and [panoramax.fr](https://panoramax.fr/).
 
 
-# 🌐 GeoVisio API
+# 🌐 Panoramax API
 
 This repository only contains __the backend and web API__ of a Panoramax instance.
 
@@ -21,7 +21,7 @@ This repository only contains __the backend and web API__ of a Panoramax instanc
 
 ## Install & run
 
-Our [documentation](https://gitlab.com/panoramax/server/api/-/tree/develop/docs) will help you install, configure and run a GeoVisio instance.
+Our [documentation](https://gitlab.com/panoramax/server/api/-/tree/develop/docs) will help you install, configure and run a Panoramax instance.
 
 If at some point you're lost or need help, you can contact us through [issues](https://gitlab.com/panoramax/server/api/-/issues) or by [email](mailto:panieravide@riseup.net).
 

geovisio-2.7.1/babel.cfg

@@ -0,0 +1,2 @@
+[python: **.py]
+[jinja2: **/templates/**.html]

{geovisio-2.6.0 → geovisio-2.7.1}/bin/post_compile

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
 pip install waitress==3.0.0
+pip install gunicorn==22.0.0
 

geovisio-2.7.1/bin/run_production_api.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# script called by the Scalingo Procfile
+# use the `USE_GUNICORN` env var to chose between gunicorn and waitress
+
+if [ "${USE_GUNICORN}" == "1" ]; then
+    DB_CHECK_SCHEMA=false gunicorn --workers "${NB_API_WORKERS:-5}" --threads "${NB_API_THREADS:-4}" -b ":$PORT" 'geovisio:create_app()'
+else
+    # use waitress
+    DB_CHECK_SCHEMA=false python3 -m waitress --port "$PORT" --url-scheme=https --threads="${NB_API_THREADS:-4}" --trusted-proxy '*' --trusted-proxy-headers 'X-Forwarded-For X-Forwarded-Host X-Forwarded-Port X-Forwarded-Proto' --log-untrusted-proxy-headers --clear-untrusted-proxy-headers --call 'geovisio:create_app'
+fi

{geovisio-2.6.0 → geovisio-2.7.1}/docker/docker-compose-blurring.yml

@@ -5,7 +5,6 @@
 # This docker-compose needs to be used alongside a docker containing geovisio API
 # For instance with docker-compose-full.yml
 # docker compose -f docker/docker-compose-full.yml -f docker/docker-compose-blurring.yml up
-version: "3"
 services:
   blurring:
     image: geovisio/blurring:develop
@@ -23,6 +22,7 @@ services:
       retries: 10
     extra_hosts:
       - "localhost:host-gateway"
+    restart: always
 
   # Add a configuration to the API/workers to tell them the location of the blurring API
   api:

{geovisio-2.6.0 → geovisio-2.7.1}/docker/docker-compose-full.yml

@@ -28,9 +28,10 @@ services:
       - 8182:8182
     volumes:
       - ./keycloak-realm.json:/opt/keycloak/data/import/geovisio_realm.json
+    restart: always
 
   migrations:
-    image: geovisio/api:latest
+    image: panoramax/api:latest
     build:
       context: ..
       dockerfile: Dockerfile
@@ -44,7 +45,7 @@ services:
         condition: service_healthy
 
   api:
-    image: geovisio/api:latest
+    image: panoramax/api:latest
     build:
       context: ..
       dockerfile: Dockerfile
@@ -76,14 +77,16 @@ services:
       - pic_data:/data/geovisio
     extra_hosts:
       - "localhost:host-gateway"
+    restart: always
 
   website:
-    image: geovisio/website:latest
+    image: panoramax/website:latest
     environment:
       VITE_INSTANCE_NAME: GeoVisio Docker
       VITE_API_URL: http://localhost:5000/
     ports:
       - 3000:3000
+    restart: always
 
   # Background workers used to process pictures in the background
   # calling the blur API and generating derivates (SD picture and tiles for faster rendering in photosphereviewer)
@@ -91,7 +94,7 @@ services:
   # Note: the blurring is done only if API_BLUR_URL is configured, and it's not the case in this docker compose
   # To have blurring, the docker-compose-blurring.yml file needs to be added (cf documentation in this docker compose file)
   background-worker:
-    image: geovisio/api:latest
+    image: panoramax/api:latest
     build:
       context: ..
       dockerfile: Dockerfile
@@ -132,6 +135,7 @@ services:
       - 5445:5432
     volumes:
       - postgres_data:/var/lib/postgresql/data/
+    restart: always
 
 volumes:
   postgres_data:

{geovisio-2.6.0 → geovisio-2.7.1}/docker/docker-compose-keycloak.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
   auth:
     image: quay.io/keycloak/keycloak:20.0.1
@@ -20,3 +19,4 @@ services:
       timeout: 5s
       retries: 20
       start_period: 15s
+    restart: always

{geovisio-2.6.0 → geovisio-2.7.1}/docker/docker-compose-minio.yml

@@ -1,6 +1,6 @@
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2023-04-20T17-56-55Z
+    image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z
     command: server --console-address ":9001" /mnt/data
     ports:
       - 9000
@@ -15,6 +15,7 @@ services:
       interval: 2s
       timeout: 5s
       retries: 3
+    restart: always
 
   create-minio-buckets:
     image: minio/mc
@@ -27,7 +28,6 @@ services:
       /usr/bin/mc mb myminio/panoramax-public;
       /usr/bin/mc mb myminio/panoramax-private;
       /usr/bin/mc anonymous set download myminio/panoramax-public;
-      exit 0;
       "
 
 volumes:

{geovisio-2.6.0 → geovisio-2.7.1}/docker/docker-entrypoint.sh

@@ -22,6 +22,9 @@ case $command in
 "api")
     python3 -m waitress --port 5000 --threads=${NB_API_THREADS:-4} --call 'geovisio:create_app'
     ;;
+"gunicorn-api")
+    gunicorn --workers ${NB_API_WORKERS:-5} --threads ${NB_API_THREADS:-4} -b :5000 'geovisio:create_app()'
+    ;;
 "ssl-api")
     python3 -m waitress --port 5000 --threads=${NB_API_THREADS:-4} --url-scheme=https --trusted-proxy '*' --trusted-proxy-headers 'X-Forwarded-For X-Forwarded-Host X-Forwarded-Port X-Forwarded-Proto' --log-untrusted-proxy-headers --clear-untrusted-proxy-headers  --call 'geovisio:create_app'
     ;;

geovisio-2.7.1/docker/full-keycloak-auth/1-init-keycloak-db.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+# create a custom schema for keycloak
+
+psql -v ON_ERROR_STOP=1  --dbname $POSTGRES_DB <<-EOSQL
+    CREATE USER keycloak_user WITH PASSWORD 'keycloak_password';
+    CREATE SCHEMA IF NOT EXISTS keycloak AUTHORIZATION keycloak_user;
+EOSQL
+

geovisio-2.7.1/docker/full-keycloak-auth/Dockerfile.keycloak

@@ -0,0 +1,21 @@
+FROM quay.io/keycloak/keycloak:24.0.4 as builder
+
+# Enable health and metrics support
+ENV KC_HEALTH_ENABLED=true
+ENV KC_METRICS_ENABLED=true
+# tell keycloak it will be behind a /oauth prefix in nginx
+ENV KC_HTTP_RELATIVE_PATH=/oauth
+
+# Configure a database vendor
+ENV KC_DB=postgres
+
+WORKDIR /opt/keycloak
+
+# for demonstration purposes only, please make sure to use proper certificates in production instead
+RUN keytool -genkeypair -storepass password -storetype PKCS12 -keyalg RSA -keysize 2048 -dname "CN=server" -alias server -ext "SAN:c=DNS:localhost,IP:127.0.0.1" -keystore conf/server.keystore
+RUN /opt/keycloak/bin/kc.sh build
+
+FROM quay.io/keycloak/keycloak:24.0.4
+COPY --from=builder /opt/keycloak/ /opt/keycloak/
+
+ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]