midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-05 18:18:13 +01:00
commit ac1b4a010c
40 changed files with 5706 additions and 4746 deletions
Download patch file Download diff file Expand all files Collapse all files

19
assets/layers/barrier/barrier.json
View file

@ -80,7 +80,7 @@
"de": "Fahrradhindernis"
},
"tags": [
"barrier=bollard"
"barrier=cycle_barrier"
],
"description": {
"en": "Cycle barrier, slowing down cyclists",
@ -125,6 +125,23 @@
],
"id": "bicycle=yes/no"
},
{
"id": "barrier_type",
"mappings": [
{
"if": "barrier=bollard",
"then": {
"en": "This is a single bollard in the road"
}
},{
"if": "barrier=cycle_barrier",
"then": {
"en": "This is a cycle barrier slowing down cyclists",
"nl": "Dit zijn fietshekjes die fietsers afremmen"
}
}
]
},
{
"question": {
"en": "What kind of bollard is this?",

10
assets/layers/conflation/conflation.json
View file

@ -15,7 +15,15 @@
"mapRendering": [
{
"location": "point",
"icon": "addSmall:#000",
"icon": {
"render": "addSmall:#000",
"mappings": [
{
"if": "detach=yes",
"then": "circle:white;close:#c33"
}
]
},
"iconSize": "10,10,center"
},
{

11
assets/layers/etymology/etymology.json
View file

@ -184,9 +184,16 @@
}
]
},
"fill": "no",
"width": {
"render": "8"
"render": "8",
"mappings": [
{
"if": "_geometry:type=Polygon",
"then": "16"
}
]
}
}
]
}
}

4
assets/layers/food/food.json
View file

@ -543,7 +543,7 @@
"condition": "cuisine=friture"
},
"service:electricity",
"dog-access"
"dog-access","reviews"
],
"filter": [
{
@ -679,4 +679,4 @@
"description": {
"en": "A layer showing restaurants and fast-food amenities (with a special rendering for friteries)"
}
}
}

32
assets/tagRenderings/questions.json
View file

@ -71,9 +71,17 @@
"ca": "Quin és el telèfon de {name}?"
},
"render": "<a href='tel:{phone}'>{phone}</a>",
"mappings": [
{
"if": "contact:phone~*",
"then": "<a href='tel:{contact:phone}'>{contact:phone}</a>",
"hideInAnswer": true
}
],
"freeform": {
"key": "phone",
"type": "phone"
"type": "phone",
"addExtraTags": ["contact:phone="]
}
},
"osmlink": {
@ -140,9 +148,17 @@
"hu": "Mi a(z) {name} e-mail címe?",
"ca": "Quina és l'adreça de correu electrònic de {name}?"
},
"mappings": [
{
"if": "contact:email~*",
"then": "<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>",
"hideInAnswer": true
}
],
"freeform": {
"key": "email",
"type": "email"
"type": "email",
"addExtraTags": ["contact:email="]
}
},
"website": {
@ -168,8 +184,16 @@
"render": "<a href='{website}' target='_blank'>{website}</a>",
"freeform": {
"key": "website",
"type": "url"
}
"type": "url",
"addExtraTags": ["contact:website="]
},
"mappings": [
{
"if": "contact:website~*",
"then": "<a href='{contact:website}' target='_blank'>{contact:website}</a>",
"hideInAnswer": true
}
]
},
"wheelchair-access": {
"question": {

2
assets/themes/aed/aed_brugge.json
View file

@ -18,7 +18,7 @@
"layers": [
"defibrillator",
{
"id": "Brugge",
"id": "brugge",
"name": "Brugse dataset",
"source": {
"osmTags": "Brugs volgnummer~*",

49
assets/themes/grb_import/grb.json
View file

@ -93,7 +93,7 @@
}
},
{
"id": "OSM-buildings",
"id": "osm-buildings",
"name": "All OSM-buildings",
"source": {
"osmTags": "building~*",
@ -301,6 +301,24 @@
}
]
},
{
"id": "service_ways",
"name": "Service roads",
"description": "A seperate layer with service roads, as to remove them from the intersection testing",
"source": {
"osmTags": "highway=service"
},
"mapRendering": [
{
"width": 4,
"color": "#888888"
}
],
"title": {
"render": "Service road"
},
"tagRenderings": []
},
{
"id": "generic_osm_object",
"name": "All OSM Objects",
@ -354,13 +372,13 @@
"builtin": "crab_address",
"override": {
"calculatedTags+": [
"_embedded_in=feat.overlapWith('OSM-buildings').filter(b => /* Do not match newly created objects */ b.feat.properties.id.indexOf('-') < 0)[0]?.feat?.properties ?? {}",
"_embedded_in=feat.overlapWith('osm-buildings').filter(b => /* Do not match newly created objects */ b.feat.properties.id.indexOf('-') < 0)[0]?.feat?.properties ?? {}",
"_embedding_nr=feat.get('_embedded_in')['addr:housenumber']+(feat.get('_embedded_in')['addr:unit'] ?? '')",
"_embedding_street=feat.get('_embedded_in')['addr:street']",
"_embedding_id=feat.get('_embedded_in').id",
"_closeby_addresses=feat.closestn('address',10,undefined,50).map(f => f.feat).filter(addr => addr.properties['addr:street'] == feat.properties['STRAATNM'] && feat.properties['HNRLABEL'] == addr.properties['addr:housenumber'] + (addr.properties['addr:unit']??'') ).length",
"_has_identical_closeby_address=feat.get('_closeby_addresses') >= 1 ? 'yes' : 'no'",
"_embedded_in_grb=feat.overlapWith('GRB')[0]?.feat?.properties ?? {}",
"_embedded_in_grb=feat.overlapWith('grb')[0]?.feat?.properties ?? {}",
"_embedding_nr_grb=feat.get('_embedded_in_grb')['addr:housenumber']",
"_embedding_street_grb=feat.get('_embedded_in_grb')['addr:street']"
],
@ -434,7 +452,7 @@
},
{
"id": "import-button",
"render": "{import_button(address, addr:street=$STRAATNM; addr:housenumber=$_HNRLABEL,Voeg dit adres als een nieuw adrespunt toe,,OSM-buildings,5)}",
"render": "{import_button(address, addr:street=$STRAATNM; addr:housenumber=$_HNRLABEL,Voeg dit adres als een nieuw adrespunt toe,,osm-buildings,5)}",
"condition": {
"and": [
"_embedding_id!=",
@ -451,10 +469,15 @@
}
},
{
"id": "GRB",
"id": "grb",
"description": "Geometry which comes from GRB with tools to import them",
"source": {
"osmTags": "HUISNR~*",
"osmTags": {
"and": [
"HUISNR~*",
"man_made!=mast"
]
},
"geoJson": "https://betadata.grbosm.site/grb?bbox={x_min},{y_min},{x_max},{y_max}",
"geoJsonZoomLevel": 18,
"mercatorCrs": true,
@ -463,7 +486,7 @@
"name": "GRB geometries",
"title": "GRB outline",
"calculatedTags": [
"_overlaps_with_buildings=feat.overlapWith('OSM-buildings')",
"_overlaps_with_buildings=feat.overlapWith('osm-buildings').filter(f => f.feat.properties.id.indexOf('-') < 0)",
"_overlaps_with=feat.get('_overlaps_with_buildings').filter(f => f.overlap > 1 /* square meter */ )[0] ?? ''",
"_overlap_absolute=feat.get('_overlaps_with')?.overlap",
"_overlap_percentage=Math.round(100 * feat.get('_overlap_absolute') / feat.get('_surface')) ",
@ -484,7 +507,7 @@
"tagRenderings": [
{
"id": "Import-button",
"render": "{import_way_button(OSM-buildings,building=$building;man_made=$man_made; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref; addr:street=$addr:street; addr:housenumber=$addr:housenumber; building:min_level=$_building:min_level, Upload this building to OpenStreetMap,,_is_part_of_building=true,1,_moveable=true)}",
"render": "{import_way_button(osm-buildings,building=$building;man_made=$man_made; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref; addr:street=$addr:street; addr:housenumber=$addr:housenumber; building:min_level=$_building:min_level, Upload this building to OpenStreetMap,,_is_part_of_building=true,1,_moveable=true)}",
"mappings": [
{
"#": "Hide import button if intersection with other objects are detected",
@ -501,11 +524,11 @@
"addr:housenumber~*"
]
},
"then": "{conflate_button(OSM-buildings,building=$_target_building_type; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref; addr:street=$addr:street; addr:housenumber=$addr:housenumber, Replace the geometry in OpenStreetMap and add the address,,_osm_obj:id)}"
"then": "{conflate_button(osm-buildings,building=$_target_building_type; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref; addr:street=$addr:street; addr:housenumber=$addr:housenumber, Replace the geometry in OpenStreetMap and add the address,,_osm_obj:id)}"
},
{
"if": "_overlaps_with!=",
"then": "{conflate_button(OSM-buildings,building=$_target_building_type; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref, Replace the geometry in OpenStreetMap,,_osm_obj:id)}"
"then": "{conflate_button(osm-buildings,building=$_target_building_type; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref, Replace the geometry in OpenStreetMap,,_osm_obj:id)}"
}
]
},
@ -548,6 +571,12 @@
"_osm_obj:id~*",
"addr:street~*",
"addr:housenumber~*",
{
"or": [
"addr:street~*",
"addr:housenumber~*"
]
},
{
"or": [
"addr:street!:={_osm_obj:addr:street}",

2
assets/themes/grb_import/grb_fixme.json
View file

@ -31,7 +31,7 @@
},
"layers": [
{
"id": "OSM-buildings-fixme",
"id": "osm-buildings-fixme",
"name": "OSM-buildings with a fixme",
"source": {
"osmTags": {

6
assets/themes/grb_import/missing_streets.json
View file

@ -42,7 +42,7 @@
}
],
"calculatedTags": [
"_overlapping=Number(feat.properties.zoom) >= 14 ? feat.overlapWith('OSM-buildings').map(ff => ff.feat.properties) : undefined",
"_overlapping=Number(feat.properties.zoom) >= 14 ? feat.overlapWith('osm-buildings').map(ff => ff.feat.properties) : undefined",
"_applicable=feat.get('_overlapping').filter(p => (p._spelling_is_correct === 'true') && (p._singular_import === 'true')).map(p => p.id)",
"_applicable_count=feat.get('_applicable')?.length"
],
@ -67,7 +67,7 @@
},
{
"id": "autoapply",
"render": "{auto_apply(OSM-buildings, _applicable, apply_streetname, Automatically add all missing streetnames on buildings in view)}"
"render": "{auto_apply(osm-buildings, _applicable, apply_streetname, Automatically add all missing streetnames on buildings in view)}"
}
]
}
@ -89,7 +89,7 @@
}
},
{
"id": "OSM-buildings",
"id": "osm-buildings",
"name": "Alle OSM-gebouwen met een huisnummer en zonder straat",
"source": {
"osmTags": {

2
assets/themes/street_lighting/street_lighting_assen.json
View file

@ -19,7 +19,7 @@
"layers": [
"street_lamps",
{
"id": "Assen",
"id": "assen",
"name": "Dataset Assen",
"source": {
"osmTags": "Lichtmastnummer~*",