diff --git a/images/cgimap/start.sh b/images/cgimap/start.sh index 57066f49..c26c52e1 100755 --- a/images/cgimap/start.sh +++ b/images/cgimap/start.sh @@ -19,6 +19,8 @@ export CGIMAP_MAP_AREA="0.25" export CGIMAP_MAP_NODES="100000" export CGIMAP_MAX_WAY_NODES="2000" export CGIMAP_MAX_RELATION_MEMBERS="32000" +# Count created/modified/deleted nodes, ways and relations per changeset (num_*_* columns) +export CGIMAP_CHANGESET_ENHANCED_STATS="true" # export CGIMAP_RATELIMIT_UPLOAD="true" export CGIMAP_MODERATOR_RATELIMIT="1048576" export CGIMAP_MODERATOR_MAXDEBT="2048" diff --git a/images/web/start.sh b/images/web/start.sh index 2c771236..7868df5d 100755 --- a/images/web/start.sh +++ b/images/web/start.sh @@ -133,6 +133,9 @@ setup_production() { # Tiler host. Defaults to vtiles.; override VTILES_DOMAIN to use a # shared tiler (e.g. a preview that has no tiler of its own). VTILES_DOMAIN="${VTILES_DOMAIN:-vtiles.${SERVER_URL_}}" + # API host used by iD. Defaults to api.; override API_DOMAIN when the + # API is served from the same host (e.g. a preview). + API_DOMAIN="${API_DOMAIN:-api.${SERVER_URL_}}" find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|openhistoricalmap.github.io|${SERVER_URL}|g" {} + find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|http://localhost:8888|https://${SERVER_URL}/map-styles|g" {} + find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|www.openhistoricalmap.org|${SERVER_URL}|g" {} + @@ -155,6 +158,7 @@ setup_production() { -e "s|openhistoricalmap.github.io|${SERVER_URL}|g" \ -e "s|http://localhost:8888|https://${SERVER_URL}/map-styles|g" \ -e "s|www.openhistoricalmap.org|${SERVER_URL}|g" \ + -e "s|\"api.openhistoricalmap.org\"|\"${API_DOMAIN}\"|g" \ -e "s|vtiles.openhistoricalmap.org|${VTILES_DOMAIN}|g" \ -e "s|vtiles.staging.openhistoricalmap.org|${VTILES_DOMAIN}|g" \ "$file" diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index aadf4ae4..3a2ce788 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-0.dev.git.1015.h2f60149' + version: '2.0.0' repository: https://osm-seed.github.io/osm-seed-chart/ \ No newline at end of file diff --git a/values.k3s.preview.template.yaml b/values.k3s.preview.template.yaml index a9fe45de..e0bb7eba 100644 --- a/values.k3s.preview.template.yaml +++ b/values.k3s.preview.template.yaml @@ -30,7 +30,9 @@ osm-seed: MAILER_FROM: web@noreply.openhistoricalmap.org NOMINATIM_URL: nominatim.openhistoricalmap.org OVERPASS_URL: overpass-api.openhistoricalmap.org - VTILES_DOMAIN: vtiles.ohmstaging.org + VTILES_DOMAIN: vtiles.openhistoricalmap.org + # preview has no api.* host; iD talks to the same host + API_DOMAIN: "{{PREVIEW_HOST}}" # NEW_RELIC_LICENSE_KEY: "none" # NEW_RELIC_APP_NAME: "none" diff --git a/values.production.template.yaml b/values.production.template.yaml index 9479e0a8..9792b8f7 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -126,6 +126,7 @@ osm-seed: NOMINATIM_URL: nominatim.openhistoricalmap.org OVERPASS_URL: overpass-api.openhistoricalmap.org VTILES_DOMAIN: vtiles.openhistoricalmap.org + API_DOMAIN: api.openhistoricalmap.org NEW_RELIC_LICENSE_KEY: 'none' NEW_RELIC_APP_NAME: 'none' diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 4997bdfb..7f3500e4 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -124,6 +124,7 @@ osm-seed: NOMINATIM_URL: nominatim.ohmstaging.org OVERPASS_URL: overpass-api.ohmstaging.org VTILES_DOMAIN: vtiles.ohmstaging.org + API_DOMAIN: api.ohmstaging.org NEW_RELIC_LICENSE_KEY: "none" NEW_RELIC_APP_NAME: "none"