From 7ffa3434bf856275d8785a05777973c782b762dc Mon Sep 17 00:00:00 2001 From: Rub21 Date: Sun, 14 Apr 2024 12:58:25 -0500 Subject: [PATCH] Update taginfo version --- images/taginfo/taginfo-config-staging.json | 51 +++++++++++++++++++++- ohm/requirements.yaml | 2 +- values.staging.template.yaml | 2 + 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/images/taginfo/taginfo-config-staging.json b/images/taginfo/taginfo-config-staging.json index f2a8ae28..8d010b22 100644 --- a/images/taginfo/taginfo-config-staging.json +++ b/images/taginfo/taginfo-config-staging.json @@ -10,17 +10,66 @@ "access_control_allow_origin": "*", "sections": ["download", "taginfo"] }, + "geodistribution": { + "left": -180, + "bottom": -90, + "right": 180, + "top": 90, + "width": 360, + "height": 180, + "scale_image": 2, + "scale_compare_image" : 1, + "background_image": "/img/mapbg/world.png", + "image_attribution": "osm-seed" + }, + "paths": { + "data_dir": "/usr/src/app/data", + "download_dir": "/usr/src/app/taginfo/web/public/download", + "bin_dir": "/usr/src/app/taginfo-tools/build/src", + "sqlite3_pcre_extension": "/usr/lib/sqlite3/pcre.so" + }, + "xapi": { + "max_results": 1000, + "url_prefix": "https://overpass-api.de/api/xapi_meta?" + }, "turbo": { "max_auto": 1000, - "url_prefix": "https://staging-overpass-api.openhistoricalmap.org", + "url_prefix": "https://overpass-turbo-staging.openhistoricalmap.org", "wizard_area": "global" }, + "level0": { + "max_results": 50, + "overpass_url_prefix": "https://overpass-api.staging.openhistoricalmap.org?", + "level0_url_prefix": "http://level0.osmz.ru/?" + }, + "opensearch": { + "shortname": "Taginfo Instance", + "contact": "admin@openhistoricalmap.org", + "description": "Find metadata about OpenHistoricalMap tags", + "tags": "OHM OpenHistoricalMap tags taginfo" + }, "sources": { + "download": "languages wiki wikidata", + "create": "db projects chronology", + "db": { + "planetfile": "/osm/planet/var/current-planet.osm.pbf", + "bindir": "/apps/data/update/build/src" + }, + "chronology": { + "osm_history_file": "/osm/planet/var/current-history-planet.osh.pbf" + }, "master": { "min_count_tags": 10, "min_tag_combination_count": 10, "min_count_for_map": 10, "min_count_relations_per_type": 10 } + }, + "logging": { + "directory": "/usr/src/app/logs", + "min_duration": 0.1 + }, + "tagstats": { + "geodistribution": "FlexMem" } } diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index c5e0f866..e81fbde2 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-n791.hae1c111' + version: '0.1.0-n798.hddd6129' repository: https://devseed.com/osm-seed-chart/ diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 7addef9c..f0cbfc7b 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -670,6 +670,8 @@ osm-seed: TAGINFO_PROJECT_REPO: https://github.com/OpenHistoricalMap/taginfo-projects.git DOWNLOAD_DB: 'languages wiki' CREATE_DB: 'db projects chronology' + ENVIRONMENT: development + AWS_S3_BUCKET: taginfo resources: enabled: false requests: