diff --git a/Svg.ts b/Svg.ts
index e787d439eb..66d15883fb 100644
--- a/Svg.ts
+++ b/Svg.ts
@@ -239,11 +239,6 @@ export default class Svg {
public static osm_logo_svg() { return new Img(Svg.osm_logo, true);}
public static osm_logo_ui() { return new FixedUiElement(Svg.osm_logo_img);}
- public static pedestrian_crossing = " "
- public static pedestrian_crossing_img = Img.AsImageElement(Svg.pedestrian_crossing)
- public static pedestrian_crossing_svg() { return new Img(Svg.pedestrian_crossing, true);}
- public static pedestrian_crossing_ui() { return new FixedUiElement(Svg.pedestrian_crossing_img);}
-
public static pencil = ""
public static pencil_img = Img.AsImageElement(Svg.pencil)
public static pencil_svg() { return new Img(Svg.pencil, true);}
@@ -324,11 +319,6 @@ export default class Svg {
public static statistics_svg() { return new Img(Svg.statistics, true);}
public static statistics_ui() { return new FixedUiElement(Svg.statistics_img);}
- public static traffic_lights = " "
- public static traffic_lights_img = Img.AsImageElement(Svg.traffic_lights)
- public static traffic_lights_svg() { return new Img(Svg.traffic_lights, true);}
- public static traffic_lights_ui() { return new FixedUiElement(Svg.traffic_lights_img);}
-
public static translate = " "
public static translate_img = Img.AsImageElement(Svg.translate)
public static translate_svg() { return new Img(Svg.translate, true);}
@@ -354,4 +344,4 @@ export default class Svg {
public static wikipedia_svg() { return new Img(Svg.wikipedia, true);}
public static wikipedia_ui() { return new FixedUiElement(Svg.wikipedia_img);}
-public static All = {"SocialImageForeground.svg": Svg.SocialImageForeground,"add.svg": Svg.add,"addSmall.svg": Svg.addSmall,"ampersand.svg": Svg.ampersand,"arrow-left-smooth.svg": Svg.arrow_left_smooth,"arrow-right-smooth.svg": Svg.arrow_right_smooth,"back.svg": Svg.back,"barrier.svg": Svg.barrier,"bug.svg": Svg.bug,"camera-plus.svg": Svg.camera_plus,"checkmark.svg": Svg.checkmark,"circle.svg": Svg.circle,"clock.svg": Svg.clock,"close.svg": Svg.close,"compass.svg": Svg.compass,"cross_bottom_right.svg": Svg.cross_bottom_right,"crosshair-blue-center.svg": Svg.crosshair_blue_center,"crosshair-blue.svg": Svg.crosshair_blue,"crosshair.svg": Svg.crosshair,"cycle-infra.svg": Svg.cycle_infra,"delete_icon.svg": Svg.delete_icon,"direction.svg": Svg.direction,"direction_gradient.svg": Svg.direction_gradient,"direction_masked.svg": Svg.direction_masked,"direction_outline.svg": Svg.direction_outline,"direction_stroke.svg": Svg.direction_stroke,"down.svg": Svg.down,"envelope.svg": Svg.envelope,"floppy.svg": Svg.floppy,"gear.svg": Svg.gear,"help.svg": Svg.help,"home.svg": Svg.home,"home_white_bg.svg": Svg.home_white_bg,"josm_logo.svg": Svg.josm_logo,"layers.svg": Svg.layers,"layersAdd.svg": Svg.layersAdd,"logo.svg": Svg.logo,"logout.svg": Svg.logout,"mapcomplete_logo.svg": Svg.mapcomplete_logo,"mapillary.svg": Svg.mapillary,"mapillary_black.svg": Svg.mapillary_black,"min.svg": Svg.min,"no_checkmark.svg": Svg.no_checkmark,"or.svg": Svg.or,"osm-copyright.svg": Svg.osm_copyright,"osm-logo-us.svg": Svg.osm_logo_us,"osm-logo.svg": Svg.osm_logo,"pedestrian_crossing.svg": Svg.pedestrian_crossing,"pencil.svg": Svg.pencil,"phone.svg": Svg.phone,"pin.svg": Svg.pin,"plus.svg": Svg.plus,"pop-out.svg": Svg.pop_out,"reload.svg": Svg.reload,"ring.svg": Svg.ring,"search.svg": Svg.search,"send_email.svg": Svg.send_email,"share.svg": Svg.share,"square.svg": Svg.square,"star.svg": Svg.star,"star_half.svg": Svg.star_half,"star_outline.svg": Svg.star_outline,"star_outline_half.svg": Svg.star_outline_half,"statistics.svg": Svg.statistics,"traffic_lights.svg": Svg.traffic_lights,"translate.svg": Svg.translate,"up.svg": Svg.up,"wikidata.svg": Svg.wikidata,"wikimedia-commons-white.svg": Svg.wikimedia_commons_white,"wikipedia.svg": Svg.wikipedia};}
+public static All = {"SocialImageForeground.svg": Svg.SocialImageForeground,"add.svg": Svg.add,"addSmall.svg": Svg.addSmall,"ampersand.svg": Svg.ampersand,"arrow-left-smooth.svg": Svg.arrow_left_smooth,"arrow-right-smooth.svg": Svg.arrow_right_smooth,"back.svg": Svg.back,"barrier.svg": Svg.barrier,"bug.svg": Svg.bug,"camera-plus.svg": Svg.camera_plus,"checkmark.svg": Svg.checkmark,"circle.svg": Svg.circle,"clock.svg": Svg.clock,"close.svg": Svg.close,"compass.svg": Svg.compass,"cross_bottom_right.svg": Svg.cross_bottom_right,"crosshair-blue-center.svg": Svg.crosshair_blue_center,"crosshair-blue.svg": Svg.crosshair_blue,"crosshair.svg": Svg.crosshair,"cycle-infra.svg": Svg.cycle_infra,"delete_icon.svg": Svg.delete_icon,"direction.svg": Svg.direction,"direction_gradient.svg": Svg.direction_gradient,"direction_masked.svg": Svg.direction_masked,"direction_outline.svg": Svg.direction_outline,"direction_stroke.svg": Svg.direction_stroke,"down.svg": Svg.down,"envelope.svg": Svg.envelope,"floppy.svg": Svg.floppy,"gear.svg": Svg.gear,"help.svg": Svg.help,"home.svg": Svg.home,"home_white_bg.svg": Svg.home_white_bg,"josm_logo.svg": Svg.josm_logo,"layers.svg": Svg.layers,"layersAdd.svg": Svg.layersAdd,"logo.svg": Svg.logo,"logout.svg": Svg.logout,"mapcomplete_logo.svg": Svg.mapcomplete_logo,"mapillary.svg": Svg.mapillary,"mapillary_black.svg": Svg.mapillary_black,"min.svg": Svg.min,"no_checkmark.svg": Svg.no_checkmark,"or.svg": Svg.or,"osm-copyright.svg": Svg.osm_copyright,"osm-logo-us.svg": Svg.osm_logo_us,"osm-logo.svg": Svg.osm_logo,"pencil.svg": Svg.pencil,"phone.svg": Svg.phone,"pin.svg": Svg.pin,"plus.svg": Svg.plus,"pop-out.svg": Svg.pop_out,"reload.svg": Svg.reload,"ring.svg": Svg.ring,"search.svg": Svg.search,"send_email.svg": Svg.send_email,"share.svg": Svg.share,"square.svg": Svg.square,"star.svg": Svg.star,"star_half.svg": Svg.star_half,"star_outline.svg": Svg.star_outline,"star_outline_half.svg": Svg.star_outline_half,"statistics.svg": Svg.statistics,"translate.svg": Svg.translate,"up.svg": Svg.up,"wikidata.svg": Svg.wikidata,"wikimedia-commons-white.svg": Svg.wikimedia_commons_white,"wikipedia.svg": Svg.wikipedia};}
diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json
index affcb8a659..23cd1fee69 100644
--- a/assets/layers/crossings/crossings.json
+++ b/assets/layers/crossings/crossings.json
@@ -37,13 +37,13 @@
]
},
"icon": {
- "render": "./assets/svg/pedestrian_crossing.svg",
+ "render": "./assets/layers/crossings/pedestrian_crossing.svg",
"mappings": [
{
"if": {
"or": ["highway=traffic_signals", "crossing=traffic_signals"]
},
- "then": "./assets/svg/traffic_lights.svg"
+ "then": "./assets/layers/crossings/traffic_lights.svg"
}
]
},
@@ -94,6 +94,85 @@
}
}
]
+ },
+ {
+ "question": {
+ "en": "Does this crossing have an island in the middle?",
+ "nl": "Heeft deze oversteekplaats een verkeerseiland in het midden?"
+ },
+ "condition": "highway=crossing",
+ "mappings": [
+ {
+ "if": "crossing:island=yes",
+ "then": {
+ "en": "This crossing has an island in the middle",
+ "nl": "Deze oversteekplaats heeft een verkeerseiland in het midden"
+ }
+ },
+ {
+ "if": "crossing:island=no",
+ "then": {
+ "en": "This crossing does not have an island in the middle",
+ "nl": "Deze oversteekplaats heeft niet een verkeerseiland in het midden"
+ }
+ }
+ ]
+ },
+ {
+ "question": {
+ "en": "Does this crossing have tactile paving?",
+ "nl": "Heeft deze oversteekplaats een geleidelijn?"
+ },
+ "condition": "highway=crossing",
+ "mappings": [
+ {
+ "if": "tactile_paving=yes",
+ "then": {
+ "en": "This crossing has tactile paving",
+ "nl": "Deze oversteekplaats heeft een geleidelijn"
+ }
+ },
+ {
+ "if": "tactile_paving=no",
+ "then": {
+ "en": "This crossing does not have tactile paving",
+ "nl": "Deze oversteekplaats heeft niet een geleidelijn"
+ }
+ },
+ {
+ "if": "tactile_paving=incorrect",
+ "then": {
+ "en": "This crossing has tactile paving, but is not correct",
+ "nl": "Deze oversteekplaats heeft een geleidelijn, die incorrect is."
+ },
+ "hideInAnswer": true
+ }
+ ]
+ },
+ {
+ "question": {
+ "en": "Does this traffic light have a button to request green light?",
+ "nl": "Heeft dit verkeerslicht een knop voor groen licht?"
+ },
+ "condition": {
+ "or": ["highway=traffic_signals", "crossing=traffic_signals"]
+ },
+ "mappings": [
+ {
+ "if": "button_operated=yes",
+ "then": {
+ "en": "This traffic light has a button to request green light",
+ "nl": "Dit verkeerslicht heeft een knop voor groen licht"
+ }
+ },
+ {
+ "if": "button_operated=no",
+ "then": {
+ "en": "This traffic light does not have a button to request green light",
+ "nl": "Dit verkeerlicht heeft niet een knop voor groen licht"
+ }
+ }
+ ]
}
]
}
diff --git a/assets/layers/crossings/license_info.json b/assets/layers/crossings/license_info.json
new file mode 100644
index 0000000000..b5a0b67e1e
--- /dev/null
+++ b/assets/layers/crossings/license_info.json
@@ -0,0 +1,22 @@
+[
+ {
+ "authors": [
+ "Tobias Zwick"
+ ],
+ "path": "pedestrian_crossing.svg",
+ "license": "CC-BY-SA 4.0",
+ "sources": [
+ "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/pedestrian_crossing.svg"
+ ]
+ },
+ {
+ "authors": [
+ "Tobias Zwick"
+ ],
+ "path": "traffic_lights.svg",
+ "license": "CC-BY-SA 4.0",
+ "sources": [
+ "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/traffic_lights.svg"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/svg/pedestrian_crossing.svg b/assets/layers/crossings/pedestrian_crossing.svg
similarity index 100%
rename from assets/svg/pedestrian_crossing.svg
rename to assets/layers/crossings/pedestrian_crossing.svg
diff --git a/assets/svg/traffic_lights.svg b/assets/layers/crossings/traffic_lights.svg
similarity index 100%
rename from assets/svg/traffic_lights.svg
rename to assets/layers/crossings/traffic_lights.svg
diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json
index 53f8dc63a2..7cb81d246f 100644
--- a/assets/svg/license_info.json
+++ b/assets/svg/license_info.json
@@ -342,16 +342,6 @@
"https://www.vecteezy.com/vector-art/226361-ornaments-and-flourishes"
]
},
- {
- "authors": [
- "Tobias Zwick"
- ],
- "path": "pedestrian_crossing.svg",
- "license": "CC-BY-SA 4.0",
- "sources": [
- "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/pedestrian_crossing.svg"
- ]
- },
{
"authors": [],
"path": "star.svg",
@@ -376,16 +366,6 @@
"license": "CC0; trivial",
"sources": []
},
- {
- "authors": [
- "Tobias Zwick"
- ],
- "path": "traffic_lights.svg",
- "license": "CC-BY-SA 4.0",
- "sources": [
- "https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/quest%20icons/traffic_lights.svg"
- ]
- },
{
"authors": [],
"path": "logo.svg",