diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json index 2549a704d..694694d6c 100644 --- a/assets/layers/note/note.json +++ b/assets/layers/note/note.json @@ -33,12 +33,11 @@ }, "calculatedTags": [ "_total_comments:=feat.get('comments').length", - "_first_comment:=feat.get('comments')[0].text.toLowerCase()", + "_first_comment:=feat.get('comments')[0].text", "_opened_by_anonymous_user:=feat.get('comments')[0].user === undefined", "_first_user:=feat.get('comments')[0].user", - "_first_user_lc:=feat.get('comments')[0].user?.toLowerCase()", + "_last_user:=(() => {const comms = feat.get('comments'); return comms[comms.length - 1].user})()", "_first_user_id:=feat.get('comments')[0].uid", - "_last_user_lc:=(() => {const comms = feat.get('comments'); return comms[comms.length - 1].user?.toLowerCase()})()", "_is_import_note:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.osm.be/\\([a-zA-Z_-]+\\)\\(.html\\).*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()" ], "titleIcons": [ @@ -123,7 +122,7 @@ "id": "search", "options": [ { - "osmTags": "_first_comment~.*{search}.*", + "osmTags": "_first_comment~i~.*{search}.*", "fields": [ { "name": "search" @@ -141,7 +140,7 @@ "id": "not", "options": [ { - "osmTags": "_first_comment!~.*{search}.*", + "osmTags": "_first_comment!~i~.*{search}.*", "fields": [ { "name": "search" @@ -159,7 +158,7 @@ "id": "opened_by", "options": [ { - "osmTags": "_first_user_lc~.*{search}.*", + "osmTags": "_first_user~i~.*{search}.*", "fields": [ { "name": "search" @@ -177,7 +176,7 @@ "id": "not_opened_by", "options": [ { - "osmTags": "_first_user_lc!~.*{search}.*", + "osmTags": "_first_user!~i~.*{search}.*", "fields": [ { "name": "search" @@ -195,7 +194,7 @@ "id": "edited_by", "options": [ { - "osmTags": "_last_user_lc~.*{search}.*", + "osmTags": "_last_user~i~.*{search}.*", "fields": [ { "name": "search" @@ -213,7 +212,7 @@ "id": "not_edited_by", "options": [ { - "osmTags": "_last_user_lc!~.*{search}.*", + "osmTags": "_last_user!~i~.*{search}.*", "fields": [ { "name": "search" diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json index 5b00a0412..c2d8bf7e4 100644 --- a/assets/layers/public_bookcase/public_bookcase.json +++ b/assets/layers/public_bookcase/public_bookcase.json @@ -468,7 +468,7 @@ "options": [ { "question": "Kinderboeken aanwezig?", - "osmTags": "books~.*children.*" + "osmTags": "books~i~.*children.*" } ] }, @@ -477,7 +477,7 @@ "options": [ { "question": "Boeken voor volwassenen aanwezig?", - "osmTags": "books~.*adults.*" + "osmTags": "books~i~.*adults.*" } ] }, diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index 52982c369..d92edcf9a 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -432,7 +432,7 @@ "type": "string" } ], - "osmTags": "shop~^.*{search}.*$", + "osmTags": "shop~i~.*{search}.*", "question": { "en": "Only show shops selling {search}", "de": "Nur Geschäfte, die {search} verkaufen", @@ -451,7 +451,7 @@ "type": "string" } ], - "osmTags": "name~^.*{search}.*$", + "osmTags": "name~i~.*{search}.*", "question": { "en": "Only show shops with name {search}", "de": "Nur Geschäfte mit dem Namen {search} anzeigen", diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index 3e9d5405d..e18e96878 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -203,7 +203,7 @@ "nl": "Vuilnisbak voor sigarettenpeuken", "de": "Mülleimer für Zigaretten" }, - "osmTags": "waste~.*cigarettes.*" + "osmTags": "waste~i~.*cigarettes.*" }, { "question": { @@ -211,7 +211,7 @@ "nl": "Vuilnisbak voor (vervallen) medicatie en drugs", "de": "Mülleimer für Drogen" }, - "osmTags": "waste~.*drugs.*" + "osmTags": "waste~i~.*drugs.*" }, { "question": { @@ -219,7 +219,7 @@ "nl": "Vuilnisbak voor hondenuitwerpselen", "de": "Mülleimer für Hundekot" }, - "osmTags": "waste~.*dog_excrement.*" + "osmTags": "waste~i~.*dog_excrement.*" }, { "question": { @@ -227,7 +227,7 @@ "nl": "Vuilnisbak voor zwerfvuil", "de": "Mülleimer für allgemeinen Müll" }, - "osmTags": "waste~.*trash.*" + "osmTags": "waste~i~.*trash.*" }, { "question": { @@ -235,7 +235,7 @@ "nl": "Vuilnisbak voor injectienaalden en andere scherpe voorwerpen", "de": "Mülleimer für Nadeln und andere scharfe Gegenstände" }, - "osmTags": "waste~.*sharps.*" + "osmTags": "waste~i~.*sharps.*" }, { "question": { @@ -243,7 +243,7 @@ "nl": "Vuilnisbak voor plastic", "de": "Mülleimer für Plastik" }, - "osmTags": "waste~.*plastic.*" + "osmTags": "waste~i~.*plastic.*" } ] }, diff --git a/assets/themes/cycle_highways/cycle_highways.json b/assets/themes/cycle_highways/cycle_highways.json index 8d1ea9b02..ec56dd311 100644 --- a/assets/themes/cycle_highways/cycle_highways.json +++ b/assets/themes/cycle_highways/cycle_highways.json @@ -128,7 +128,7 @@ "options": [ { "question": "Name contains 'alt'", - "osmTags": "name~.*[aA]lt.*" + "osmTags": "name~i~.*alt.*" } ] }, @@ -137,7 +137,7 @@ "options": [ { "question": "Name contains 'wenslijn'", - "osmTags": "name~.*[wW]enslijn.*" + "osmTags": "name~i~.*wenslijn.*" } ] }, @@ -146,7 +146,7 @@ "options": [ { "question": "Name contains 'omleiding'", - "osmTags": "name~.*[oO]mleiding.*" + "osmTags": "name~i~.*omleiding.*" } ] }, @@ -155,7 +155,7 @@ "options": [ { "question": "Reference contains 'alt'", - "osmTags": "ref~.*[aA]lt.*" + "osmTags": "ref~i~.*aAlt.*" } ] }, diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 6aa00ca07..78d8fd880 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,21 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Änderungen mit MapComplete", - "es": "Cambios hechos con MapComplete", - "nb_NO": "Endringer utført med MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "de": "Zeigt Änderungen von MapComplete", - "es": "Muestra los cambios hechos por MapComplete", - "nb_NO": "Vis endringer utført med MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", - "es": "Este mapa muestra todos los cambios hechos con MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "maintainer": "", "icon": "./assets/svg/logo.svg", @@ -30,10 +22,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Schwerpunkte von Änderungssätzen", - "es": "Centros de conjuntos de cambios", - "nb_NO": "Endringssettsenter" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -47,47 +36,35 @@ ], "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungen für {theme}", - "es": "Conjunto de cambios para {theme}", - "nb_NO": "Endringssett for {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "de": "Zeigt alle MapComplete Änderungen", - "es": "Muestra todos los cambios de MapComplete" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "render_id", "render": { - "en": "Changeset {id}", - "de": "Änderung {id}", - "es": "Conjunto de cambios {id}", - "nb_NO": "Endringssett {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "render": { - "en": "Change made by {_last_edit:contributor}", - "de": "Änderung wurde von {_last_edit:contributor} gemacht", - "es": "Cambio hecho por {_last_edit:contributor}" + "en": "Change made by {_last_edit:contributor}" } }, { "id": "theme", "render": { - "en": "Change with theme {theme}", - "de": "Änderung mit Thema {theme}" + "en": "Change with theme {theme}" }, "mappings": [ { "if": "theme~http.*", "then": { - "en": "Change with unofficial theme {theme}", - "de": "Änderung mit inoffiziellem Thema {theme}" + "en": "Change with unofficial theme {theme}" } } ] @@ -352,16 +329,14 @@ "id": "theme-search", "options": [ { - "osmTags": "theme~.*{search}.*", + "osmTags": "theme~i~.*{search}.*", "fields": [ { "name": "search" } ], "question": { - "en": "Themename contains {search}", - "de": "Themenname enthält {search}", - "nb_NO": "Temanavn inneholder {search}" + "en": "Themename contains {search}" } } ] @@ -370,16 +345,14 @@ "id": "created_by", "options": [ { - "osmTags": "_last_edit:contributor:lc~.*{search}.*", + "osmTags": "_last_edit:contributor:lc~i~.*{search}.*", "fields": [ { "name": "search" } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "es": "Hecho por contributor/a {search}" + "en": "Made by contributor {search}" } } ] @@ -388,16 +361,14 @@ "id": "not_created_by", "options": [ { - "osmTags": "_last_edit:contributor:lc!~.*{search}.*", + "osmTags": "_last_edit:contributor:lc!~i~.*{search}.*", "fields": [ { "name": "search" } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "es": "No hecho por contributor/a {search}" + "en": "Not made by contributor {search}" } } ] @@ -412,9 +383,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Weitere Statistiken finden Sie hier", - "es": "Se pueden encontrar más estadísticas aquí" + "en": "More statistics can be found here" } }, { diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json index 2f198e4cc..7e8b69d51 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json @@ -87,7 +87,7 @@ "id": "theme-search", "options": [ { - "osmTags": "theme~.*{search}.*", + "osmTags": "theme~i~.*{search}.*", "fields": [ { "name": "search" @@ -103,7 +103,7 @@ "id": "created_by", "options": [ { - "osmTags": "_last_edit:contributor:lc~.*{search}.*", + "osmTags": "_last_edit:contributor:lc~i~.*{search}.*", "fields": [ { "name": "search" @@ -119,7 +119,7 @@ "id": "not_created_by", "options": [ { - "osmTags": "_last_edit:contributor:lc!~.*{search}.*", + "osmTags": "_last_edit:contributor:lc!~i~.*{search}.*", "fields": [ { "name": "search"