From 80f0dbe6e3e5a32a7c6a497bb636e4485dade459 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 5 Sep 2020 01:40:43 +0200 Subject: [PATCH] New mapcomplete version --- Customizations/JSON/FromJSON.ts | 13 +- Customizations/Layouts/Groen.ts | 3 +- Customizations/Questions/WikipediaLink.ts | 6 +- Customizations/TagRendering.ts | 11 +- InitUiElements.ts | 27 ++- Logic/Osm/OsmConnection.ts | 2 + State.ts | 8 +- UI/FullScreenMessageBoxHandler.ts | 4 +- UI/i18n/Translations.ts | 39 ++++- aed.html | 70 ++++++++ aed.webmanifest | 1 + artworks.html | 70 ++++++++ artworks.webmanifest | 1 + assets/generated/bike_logo120.png | Bin 0 -> 3713 bytes assets/generated/bike_logo128.png | Bin 0 -> 3925 bytes assets/generated/bike_logo144.png | Bin 0 -> 4515 bytes assets/generated/bike_logo152.png | Bin 0 -> 4767 bytes assets/generated/bike_logo180.png | Bin 0 -> 5606 bytes assets/generated/bike_logo192.png | Bin 0 -> 5967 bytes assets/generated/bike_logo384.png | Bin 0 -> 12233 bytes assets/generated/bike_logo512.png | Bin 0 -> 16571 bytes assets/generated/bike_logo72.png | Bin 0 -> 2235 bytes assets/generated/bike_logo96.png | Bin 0 -> 3024 bytes assets/generated/bug120.png | Bin 0 -> 2454 bytes assets/generated/bug128.png | Bin 0 -> 2626 bytes assets/generated/bug144.png | Bin 0 -> 3023 bytes assets/generated/bug152.png | Bin 0 -> 3204 bytes assets/generated/bug180.png | Bin 0 -> 3768 bytes assets/generated/bug192.png | Bin 0 -> 3999 bytes assets/generated/bug384.png | Bin 0 -> 8894 bytes assets/generated/bug512.png | Bin 0 -> 12283 bytes assets/generated/bug72.png | Bin 0 -> 1424 bytes assets/generated/bug96.png | Bin 0 -> 1956 bytes .../layers_bird_hide_birdhide120.png | Bin 0 -> 3141 bytes .../layers_bird_hide_birdhide128.png | Bin 0 -> 3345 bytes .../layers_bird_hide_birdhide144.png | Bin 0 -> 3712 bytes .../layers_bird_hide_birdhide152.png | Bin 0 -> 3911 bytes .../layers_bird_hide_birdhide180.png | Bin 0 -> 4669 bytes .../layers_bird_hide_birdhide192.png | Bin 0 -> 5002 bytes .../layers_bird_hide_birdhide384.png | Bin 0 -> 10196 bytes .../layers_bird_hide_birdhide512.png | Bin 0 -> 14087 bytes .../generated/layers_bird_hide_birdhide72.png | Bin 0 -> 1912 bytes .../generated/layers_bird_hide_birdhide96.png | Bin 0 -> 2512 bytes .../layers_ghost_bike_ghost_bike120.png | Bin 0 -> 4565 bytes .../layers_ghost_bike_ghost_bike128.png | Bin 0 -> 5091 bytes .../layers_ghost_bike_ghost_bike144.png | Bin 0 -> 5706 bytes .../layers_ghost_bike_ghost_bike152.png | Bin 0 -> 6105 bytes .../layers_ghost_bike_ghost_bike180.png | Bin 0 -> 7520 bytes .../layers_ghost_bike_ghost_bike192.png | Bin 0 -> 8158 bytes .../layers_ghost_bike_ghost_bike384.png | Bin 0 -> 19084 bytes .../layers_ghost_bike_ghost_bike512.png | Bin 0 -> 26677 bytes .../layers_ghost_bike_ghost_bike72.png | Bin 0 -> 2650 bytes .../layers_ghost_bike_ghost_bike96.png | Bin 0 -> 3532 bytes assets/generated/logo120.png | Bin 0 -> 3490 bytes assets/generated/logo128.png | Bin 0 -> 3717 bytes assets/generated/logo144.png | Bin 0 -> 4283 bytes assets/generated/logo152.png | Bin 0 -> 4485 bytes assets/generated/logo180.png | Bin 0 -> 5338 bytes assets/generated/logo192.png | Bin 0 -> 5672 bytes assets/generated/logo384.png | Bin 0 -> 11848 bytes assets/generated/logo512.png | Bin 0 -> 16210 bytes assets/generated/logo72.png | Bin 0 -> 2215 bytes assets/generated/logo96.png | Bin 0 -> 2791 bytes assets/generated/osm-logo-buggy-attr120.png | Bin 0 -> 18710 bytes assets/generated/osm-logo-buggy-attr128.png | Bin 0 -> 20601 bytes assets/generated/osm-logo-buggy-attr144.png | Bin 0 -> 24534 bytes assets/generated/osm-logo-buggy-attr152.png | Bin 0 -> 26361 bytes assets/generated/osm-logo-buggy-attr180.png | Bin 0 -> 33691 bytes assets/generated/osm-logo-buggy-attr192.png | Bin 0 -> 37117 bytes assets/generated/osm-logo-buggy-attr384.png | Bin 0 -> 93593 bytes assets/generated/osm-logo-buggy-attr512.png | Bin 0 -> 135769 bytes assets/generated/osm-logo-buggy-attr72.png | Bin 0 -> 8545 bytes assets/generated/osm-logo-buggy-attr96.png | Bin 0 -> 13300 bytes assets/generated/star120.png | Bin 0 -> 1997 bytes assets/generated/star128.png | Bin 0 -> 2106 bytes assets/generated/star144.png | Bin 0 -> 2414 bytes assets/generated/star152.png | Bin 0 -> 2609 bytes assets/generated/star180.png | Bin 0 -> 3095 bytes assets/generated/star192.png | Bin 0 -> 3383 bytes assets/generated/star384.png | Bin 0 -> 7578 bytes assets/generated/star512.png | Bin 0 -> 10623 bytes assets/generated/star72.png | Bin 0 -> 1162 bytes assets/generated/star96.png | Bin 0 -> 1601 bytes assets/generated/themes_aed_aed120.png | Bin 0 -> 3511 bytes assets/generated/themes_aed_aed128.png | Bin 0 -> 3798 bytes assets/generated/themes_aed_aed144.png | Bin 0 -> 4253 bytes assets/generated/themes_aed_aed152.png | Bin 0 -> 4456 bytes assets/generated/themes_aed_aed180.png | Bin 0 -> 5238 bytes assets/generated/themes_aed_aed192.png | Bin 0 -> 5651 bytes assets/generated/themes_aed_aed384.png | Bin 0 -> 11732 bytes assets/generated/themes_aed_aed512.png | Bin 0 -> 16160 bytes assets/generated/themes_aed_aed72.png | Bin 0 -> 2199 bytes assets/generated/themes_aed_aed96.png | Bin 0 -> 2907 bytes .../generated/themes_artwork_artwork120.png | Bin 0 -> 3377 bytes .../generated/themes_artwork_artwork128.png | Bin 0 -> 3622 bytes .../generated/themes_artwork_artwork144.png | Bin 0 -> 3994 bytes .../generated/themes_artwork_artwork152.png | Bin 0 -> 4204 bytes .../generated/themes_artwork_artwork180.png | Bin 0 -> 5008 bytes .../generated/themes_artwork_artwork192.png | Bin 0 -> 5358 bytes .../generated/themes_artwork_artwork384.png | Bin 0 -> 11032 bytes .../generated/themes_artwork_artwork512.png | Bin 0 -> 15069 bytes assets/generated/themes_artwork_artwork72.png | Bin 0 -> 2047 bytes assets/generated/themes_artwork_artwork96.png | Bin 0 -> 2711 bytes .../themes_bookcases_bookcase120.png | Bin 0 -> 4420 bytes .../themes_bookcases_bookcase128.png | Bin 0 -> 4792 bytes .../themes_bookcases_bookcase144.png | Bin 0 -> 5273 bytes .../themes_bookcases_bookcase152.png | Bin 0 -> 5576 bytes .../themes_bookcases_bookcase180.png | Bin 0 -> 6580 bytes .../themes_bookcases_bookcase192.png | Bin 0 -> 7088 bytes .../themes_bookcases_bookcase384.png | Bin 0 -> 14204 bytes .../themes_bookcases_bookcase512.png | Bin 0 -> 19412 bytes .../generated/themes_bookcases_bookcase72.png | Bin 0 -> 2715 bytes .../generated/themes_bookcases_bookcase96.png | Bin 0 -> 3599 bytes .../themes_buurtnatuur_groen_logo120.png | Bin 0 -> 4743 bytes .../themes_buurtnatuur_groen_logo128.png | Bin 0 -> 5133 bytes .../themes_buurtnatuur_groen_logo144.png | Bin 0 -> 5761 bytes .../themes_buurtnatuur_groen_logo152.png | Bin 0 -> 6102 bytes .../themes_buurtnatuur_groen_logo180.png | Bin 0 -> 7172 bytes .../themes_buurtnatuur_groen_logo192.png | Bin 0 -> 7718 bytes .../themes_buurtnatuur_groen_logo384.png | Bin 0 -> 15717 bytes .../themes_buurtnatuur_groen_logo512.png | Bin 0 -> 21458 bytes .../themes_buurtnatuur_groen_logo72.png | Bin 0 -> 2949 bytes .../themes_buurtnatuur_groen_logo96.png | Bin 0 -> 3881 bytes .../generated/themes_cyclestreets_F111120.png | Bin 0 -> 154 bytes .../generated/themes_cyclestreets_F111128.png | Bin 0 -> 161 bytes .../generated/themes_cyclestreets_F111144.png | Bin 0 -> 178 bytes .../generated/themes_cyclestreets_F111152.png | Bin 0 -> 187 bytes .../generated/themes_cyclestreets_F111180.png | Bin 0 -> 222 bytes .../generated/themes_cyclestreets_F111192.png | Bin 0 -> 241 bytes .../generated/themes_cyclestreets_F111384.png | Bin 0 -> 670 bytes .../generated/themes_cyclestreets_F111512.png | Bin 0 -> 1114 bytes .../generated/themes_cyclestreets_F11172.png | Bin 0 -> 118 bytes .../generated/themes_cyclestreets_F11196.png | Bin 0 -> 134 bytes .../generated/themes_toilets_toilets120.png | Bin 0 -> 4130 bytes .../generated/themes_toilets_toilets128.png | Bin 0 -> 4432 bytes .../generated/themes_toilets_toilets144.png | Bin 0 -> 5070 bytes .../generated/themes_toilets_toilets152.png | Bin 0 -> 5254 bytes .../generated/themes_toilets_toilets180.png | Bin 0 -> 6310 bytes .../generated/themes_toilets_toilets192.png | Bin 0 -> 6690 bytes .../generated/themes_toilets_toilets384.png | Bin 0 -> 13757 bytes .../generated/themes_toilets_toilets512.png | Bin 0 -> 19076 bytes assets/generated/themes_toilets_toilets72.png | Bin 0 -> 2468 bytes assets/generated/themes_toilets_toilets96.png | Bin 0 -> 3303 bytes assets/layers/bird_hide/birdhides.json | 4 +- assets/themes/aed/aed.json | 10 +- bookcases.html | 70 ++++++++ bookcases.webmanifest | 1 + buurtnatuur.html | 70 ++++++++ buurtnatuur.webmanifest | 1 + css/mobile.css | 0 cyclofix.html | 70 ++++++++ cyclofix.webmanifest | 1 + deploy.sh | 18 +- fietsstraten.html | 70 ++++++++ fietsstraten.webmanifest | 1 + ghostbikes.html | 70 ++++++++ ghostbikes.webmanifest | 1 + grb.html | 70 ++++++++ grb.webmanifest | 1 + index.css | 162 +++++++----------- index.ts | 2 +- metamap.html | 70 ++++++++ metamap.webmanifest | 1 + natuurpunt.html | 70 ++++++++ natuurpunt.webmanifest | 1 + personal.html | 70 ++++++++ personal.webmanifest | 1 + toilets.html | 70 ++++++++ toilets.webmanifest | 1 + width.html | 70 ++++++++ width.webmanifest | 1 + 171 files changed, 1103 insertions(+), 129 deletions(-) create mode 100644 aed.html create mode 100644 aed.webmanifest create mode 100644 artworks.html create mode 100644 artworks.webmanifest create mode 100644 assets/generated/bike_logo120.png create mode 100644 assets/generated/bike_logo128.png create mode 100644 assets/generated/bike_logo144.png create mode 100644 assets/generated/bike_logo152.png create mode 100644 assets/generated/bike_logo180.png create mode 100644 assets/generated/bike_logo192.png create mode 100644 assets/generated/bike_logo384.png create mode 100644 assets/generated/bike_logo512.png create mode 100644 assets/generated/bike_logo72.png create mode 100644 assets/generated/bike_logo96.png create mode 100644 assets/generated/bug120.png create mode 100644 assets/generated/bug128.png create mode 100644 assets/generated/bug144.png create mode 100644 assets/generated/bug152.png create mode 100644 assets/generated/bug180.png create mode 100644 assets/generated/bug192.png create mode 100644 assets/generated/bug384.png create mode 100644 assets/generated/bug512.png create mode 100644 assets/generated/bug72.png create mode 100644 assets/generated/bug96.png create mode 100644 assets/generated/layers_bird_hide_birdhide120.png create mode 100644 assets/generated/layers_bird_hide_birdhide128.png create mode 100644 assets/generated/layers_bird_hide_birdhide144.png create mode 100644 assets/generated/layers_bird_hide_birdhide152.png create mode 100644 assets/generated/layers_bird_hide_birdhide180.png create mode 100644 assets/generated/layers_bird_hide_birdhide192.png create mode 100644 assets/generated/layers_bird_hide_birdhide384.png create mode 100644 assets/generated/layers_bird_hide_birdhide512.png create mode 100644 assets/generated/layers_bird_hide_birdhide72.png create mode 100644 assets/generated/layers_bird_hide_birdhide96.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike120.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike128.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike144.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike152.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike180.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike192.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike384.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike512.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike72.png create mode 100644 assets/generated/layers_ghost_bike_ghost_bike96.png create mode 100644 assets/generated/logo120.png create mode 100644 assets/generated/logo128.png create mode 100644 assets/generated/logo144.png create mode 100644 assets/generated/logo152.png create mode 100644 assets/generated/logo180.png create mode 100644 assets/generated/logo192.png create mode 100644 assets/generated/logo384.png create mode 100644 assets/generated/logo512.png create mode 100644 assets/generated/logo72.png create mode 100644 assets/generated/logo96.png create mode 100644 assets/generated/osm-logo-buggy-attr120.png create mode 100644 assets/generated/osm-logo-buggy-attr128.png create mode 100644 assets/generated/osm-logo-buggy-attr144.png create mode 100644 assets/generated/osm-logo-buggy-attr152.png create mode 100644 assets/generated/osm-logo-buggy-attr180.png create mode 100644 assets/generated/osm-logo-buggy-attr192.png create mode 100644 assets/generated/osm-logo-buggy-attr384.png create mode 100644 assets/generated/osm-logo-buggy-attr512.png create mode 100644 assets/generated/osm-logo-buggy-attr72.png create mode 100644 assets/generated/osm-logo-buggy-attr96.png create mode 100644 assets/generated/star120.png create mode 100644 assets/generated/star128.png create mode 100644 assets/generated/star144.png create mode 100644 assets/generated/star152.png create mode 100644 assets/generated/star180.png create mode 100644 assets/generated/star192.png create mode 100644 assets/generated/star384.png create mode 100644 assets/generated/star512.png create mode 100644 assets/generated/star72.png create mode 100644 assets/generated/star96.png create mode 100644 assets/generated/themes_aed_aed120.png create mode 100644 assets/generated/themes_aed_aed128.png create mode 100644 assets/generated/themes_aed_aed144.png create mode 100644 assets/generated/themes_aed_aed152.png create mode 100644 assets/generated/themes_aed_aed180.png create mode 100644 assets/generated/themes_aed_aed192.png create mode 100644 assets/generated/themes_aed_aed384.png create mode 100644 assets/generated/themes_aed_aed512.png create mode 100644 assets/generated/themes_aed_aed72.png create mode 100644 assets/generated/themes_aed_aed96.png create mode 100644 assets/generated/themes_artwork_artwork120.png create mode 100644 assets/generated/themes_artwork_artwork128.png create mode 100644 assets/generated/themes_artwork_artwork144.png create mode 100644 assets/generated/themes_artwork_artwork152.png create mode 100644 assets/generated/themes_artwork_artwork180.png create mode 100644 assets/generated/themes_artwork_artwork192.png create mode 100644 assets/generated/themes_artwork_artwork384.png create mode 100644 assets/generated/themes_artwork_artwork512.png create mode 100644 assets/generated/themes_artwork_artwork72.png create mode 100644 assets/generated/themes_artwork_artwork96.png create mode 100644 assets/generated/themes_bookcases_bookcase120.png create mode 100644 assets/generated/themes_bookcases_bookcase128.png create mode 100644 assets/generated/themes_bookcases_bookcase144.png create mode 100644 assets/generated/themes_bookcases_bookcase152.png create mode 100644 assets/generated/themes_bookcases_bookcase180.png create mode 100644 assets/generated/themes_bookcases_bookcase192.png create mode 100644 assets/generated/themes_bookcases_bookcase384.png create mode 100644 assets/generated/themes_bookcases_bookcase512.png create mode 100644 assets/generated/themes_bookcases_bookcase72.png create mode 100644 assets/generated/themes_bookcases_bookcase96.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo120.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo128.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo144.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo152.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo180.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo192.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo384.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo512.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo72.png create mode 100644 assets/generated/themes_buurtnatuur_groen_logo96.png create mode 100644 assets/generated/themes_cyclestreets_F111120.png create mode 100644 assets/generated/themes_cyclestreets_F111128.png create mode 100644 assets/generated/themes_cyclestreets_F111144.png create mode 100644 assets/generated/themes_cyclestreets_F111152.png create mode 100644 assets/generated/themes_cyclestreets_F111180.png create mode 100644 assets/generated/themes_cyclestreets_F111192.png create mode 100644 assets/generated/themes_cyclestreets_F111384.png create mode 100644 assets/generated/themes_cyclestreets_F111512.png create mode 100644 assets/generated/themes_cyclestreets_F11172.png create mode 100644 assets/generated/themes_cyclestreets_F11196.png create mode 100644 assets/generated/themes_toilets_toilets120.png create mode 100644 assets/generated/themes_toilets_toilets128.png create mode 100644 assets/generated/themes_toilets_toilets144.png create mode 100644 assets/generated/themes_toilets_toilets152.png create mode 100644 assets/generated/themes_toilets_toilets180.png create mode 100644 assets/generated/themes_toilets_toilets192.png create mode 100644 assets/generated/themes_toilets_toilets384.png create mode 100644 assets/generated/themes_toilets_toilets512.png create mode 100644 assets/generated/themes_toilets_toilets72.png create mode 100644 assets/generated/themes_toilets_toilets96.png create mode 100644 bookcases.html create mode 100644 bookcases.webmanifest create mode 100644 buurtnatuur.html create mode 100644 buurtnatuur.webmanifest create mode 100644 css/mobile.css create mode 100644 cyclofix.html create mode 100644 cyclofix.webmanifest create mode 100644 fietsstraten.html create mode 100644 fietsstraten.webmanifest create mode 100644 ghostbikes.html create mode 100644 ghostbikes.webmanifest create mode 100644 grb.html create mode 100644 grb.webmanifest create mode 100644 metamap.html create mode 100644 metamap.webmanifest create mode 100644 natuurpunt.html create mode 100644 natuurpunt.webmanifest create mode 100644 personal.html create mode 100644 personal.webmanifest create mode 100644 toilets.html create mode 100644 toilets.webmanifest create mode 100644 width.html create mode 100644 width.webmanifest diff --git a/Customizations/JSON/FromJSON.ts b/Customizations/JSON/FromJSON.ts index 48aa3403c..d2952f4e4 100644 --- a/Customizations/JSON/FromJSON.ts +++ b/Customizations/JSON/FromJSON.ts @@ -264,7 +264,18 @@ export class FromJSON { const width = FromJSON.TagRenderingWithDefault(json.width, "layerwidth", "10"); let tagRenderingDefs = json.tagRenderings ?? []; - if (tagRenderingDefs.indexOf("images") < 0) { + let hasImageElement = false; + for (const tagRenderingDef of tagRenderingDefs) { + if (typeof tagRenderingDef !== "string") { + continue; + } + let str = tagRenderingDef as string; + if(tagRenderingDef.indexOf("images") >= 0 || str.indexOf("pictures") >= 0){ + hasImageElement = true; + break; + } + } + if (!hasImageElement) { tagRenderingDefs = ["images", ...tagRenderingDefs]; } let tagRenderings = tagRenderingDefs.map(FromJSON.TagRendering); diff --git a/Customizations/Layouts/Groen.ts b/Customizations/Layouts/Groen.ts index 5f27bb148..97b92b887 100644 --- a/Customizations/Layouts/Groen.ts +++ b/Customizations/Layouts/Groen.ts @@ -14,7 +14,8 @@ export class Groen extends Layout { 50.8435, 4.3688, "\n" + - "
" + + + "
" + "

Breng jouw buurtnatuur in kaart

" + "Natuur maakt gelukkig. Aan de hand van deze website willen we de natuur dicht bij ons beter inventariseren. Met als doel meer mensen te laten genieten van toegankelijke natuur én te strijden voor meer natuur in onze buurten. \n" + "