diff --git a/README.md b/README.md index 6655be8..43113fb 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Currently the following tags are supported for the street light layer: * `operator|lamp_operator=*` * `start_date=*` * `light:colour=white|orange|yellow|blue|red|green` +* `light:flash=yes|pattern` | `light:character=*` * `light:method|lamp_type=high_pressure_sodium|high-pressure_sodium|SON|HPSV|low_pressure_sodium|low-pressure_sodium|SOX|sodium|sodium_vapor|LED|led|metal-halide|metal_halide|fluorescent|incandescent|mercury|electric|electrical|gas|gaslight` * `light:mount|lamp_mount|support=straight mast|straight_mast|bent mast|bent_mast|cast steel mast|cast_steel_mast|mast|pole|power_pole|wall_mounted|wall|suspended|wire|ceiling|ground` * `light:count=1|2|3|4` diff --git a/about.html b/about.html index 29f7f91..92fb431 100644 --- a/about.html +++ b/about.html @@ -28,6 +28,7 @@

Unterstützte Tags / Supported Tagsoperator|lamp_operator=*
  • start_date=*
  • light:colour=white|orange|yellow|blue|red|green
    • +
  • light:flash=yes|pattern | light:character=*
  • light:method|lamp_type=high_pressure_sodium|high-pressure_sodium|SON|HPSV|low_pressure_sodium|low-pressure_sodium|SOX|sodium|sodium_vapor|LED|led|metal-halide|metal_halide|fluorescent|incandescent|mercury|electric|electrical|gas|gaslight
  • light:mount|lamp_mount|support=straight mast|straight_mast|bent mast|bent_mast|cast steel mast|cast_steel_mast|mast|pole|power_pole|wall_mounted|wall|suspended|wire|ceiling|ground
  • light:count=1|2|3|4
    • diff --git a/img/electric_directed_flashing.svg b/img/electric_directed_flashing.svg new file mode 100644 index 0000000..1ace823 --- /dev/null +++ b/img/electric_directed_flashing.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_blue.svg b/img/electric_directed_flashing_blue.svg new file mode 100644 index 0000000..687764d --- /dev/null +++ b/img/electric_directed_flashing_blue.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_fluorescent.svg b/img/electric_directed_flashing_fluorescent.svg new file mode 100644 index 0000000..b7f5042 --- /dev/null +++ b/img/electric_directed_flashing_fluorescent.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_gas.svg b/img/electric_directed_flashing_gas.svg new file mode 100644 index 0000000..f8bc294 --- /dev/null +++ b/img/electric_directed_flashing_gas.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_green.svg b/img/electric_directed_flashing_green.svg new file mode 100644 index 0000000..c62a3a8 --- /dev/null +++ b/img/electric_directed_flashing_green.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_led.svg b/img/electric_directed_flashing_led.svg new file mode 100644 index 0000000..2708003 --- /dev/null +++ b/img/electric_directed_flashing_led.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_mercury.svg b/img/electric_directed_flashing_mercury.svg new file mode 100644 index 0000000..28089ec --- /dev/null +++ b/img/electric_directed_flashing_mercury.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_orange.svg b/img/electric_directed_flashing_orange.svg new file mode 100644 index 0000000..680eb7c --- /dev/null +++ b/img/electric_directed_flashing_orange.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_red.svg b/img/electric_directed_flashing_red.svg new file mode 100644 index 0000000..612d710 --- /dev/null +++ b/img/electric_directed_flashing_red.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_white.svg b/img/electric_directed_flashing_white.svg new file mode 100644 index 0000000..761d9c8 --- /dev/null +++ b/img/electric_directed_flashing_white.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/img/electric_directed_flashing_yellow.svg b/img/electric_directed_flashing_yellow.svg new file mode 100644 index 0000000..1d74847 --- /dev/null +++ b/img/electric_directed_flashing_yellow.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing.svg b/img/electric_flashing.svg new file mode 100644 index 0000000..711ac77 --- /dev/null +++ b/img/electric_flashing.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_blue.svg b/img/electric_flashing_blue.svg new file mode 100644 index 0000000..a50aa6c --- /dev/null +++ b/img/electric_flashing_blue.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_fluorescent.svg b/img/electric_flashing_fluorescent.svg new file mode 100644 index 0000000..dc94810 --- /dev/null +++ b/img/electric_flashing_fluorescent.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_gas.svg b/img/electric_flashing_gas.svg new file mode 100644 index 0000000..619ce01 --- /dev/null +++ b/img/electric_flashing_gas.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_green.svg b/img/electric_flashing_green.svg new file mode 100644 index 0000000..77c0fad --- /dev/null +++ b/img/electric_flashing_green.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_led.svg b/img/electric_flashing_led.svg new file mode 100644 index 0000000..41de7e4 --- /dev/null +++ b/img/electric_flashing_led.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_mercury.svg b/img/electric_flashing_mercury.svg new file mode 100644 index 0000000..a65dbca --- /dev/null +++ b/img/electric_flashing_mercury.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_orange.svg b/img/electric_flashing_orange.svg new file mode 100644 index 0000000..2bc4a22 --- /dev/null +++ b/img/electric_flashing_orange.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_red.svg b/img/electric_flashing_red.svg new file mode 100644 index 0000000..b576538 --- /dev/null +++ b/img/electric_flashing_red.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_white.svg b/img/electric_flashing_white.svg new file mode 100644 index 0000000..c48e0c5 --- /dev/null +++ b/img/electric_flashing_white.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/img/electric_flashing_yellow.svg b/img/electric_flashing_yellow.svg new file mode 100644 index 0000000..c2ff0fe --- /dev/null +++ b/img/electric_flashing_yellow.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/js/parse_scripts.js b/js/parse_scripts.js index 3e067fd..58d700e 100644 --- a/js/parse_scripts.js +++ b/js/parse_scripts.js @@ -165,6 +165,7 @@ function parseOSM(daten) var light_colour = ""; var light_count = 1; var light_direction = ""; + var light_flash = ""; var light_height = ""; var light_height_text = ""; var light_lit = ""; @@ -252,6 +253,14 @@ function parseOSM(daten) { light_shape = EleValue; } + if ((EleKey=="light:flash")) + { + light_flash = EleValue; + } + if ((EleKey=="light:character" && EleValue != "fixed")) + { + light_flash = "yes"; + } if ((EleKey=="light_source")) { light_source = EleValue; @@ -440,7 +449,7 @@ function parseOSM(daten) var markerLocation = new L.LatLng(EleLatNew,EleLonNew); - var Icon = getMarkerIcon(L,light_source, light_method, light_colour, light_direction_array[j], light_shape, light_height, navigationaid, ref_array[j]); + var Icon = getMarkerIcon(L,light_source, light_method, light_colour, light_flash, light_direction_array[j], light_shape, light_height, navigationaid, ref_array[j]); var marker = new L.Marker(markerLocation,{icon : Icon}); if(EleText!="") @@ -653,7 +662,7 @@ function get_light_mount(value){ } -function getMarkerIcon(L,light_source,light_method,light_colour,light_direction,light_shape,light_height,navigationaid,ref){ +function getMarkerIcon(L,light_source,light_method,light_colour,light_flash,light_direction,light_shape,light_height,navigationaid,ref){ var symbol_url = "electric"; @@ -666,9 +675,14 @@ function getMarkerIcon(L,light_source,light_method,light_colour,light_direction, if(light_direction) { symbol_url = "floodlight_directed"; } + } else if((light_source == "lantern" || light_source == "aviation") && light_shape == "directed" && light_direction) { + symbol_url = "electric_directed"; + if (light_flash && light_flash != "no") { + symbol_url = "electric_directed_flashing"; + } } else { - if((light_source == "lantern" || light_source == "aviation") && light_shape == "directed" && light_direction) { - symbol_url = "electric_directed"; + if (light_flash && light_flash != "no") { + symbol_url = "electric_flashing"; } } diff --git a/taginfo.json b/taginfo.json index 5a2971a..98c555c 100644 --- a/taginfo.json +++ b/taginfo.json @@ -187,6 +187,16 @@ "object_types": ["node"], "description": "Shows the time when lights are lit." }, + { + "key": "light:flash", + "object_types": ["node"], + "description": "Show flashing lights." + }, + { + "key": "light:character", + "object_types": ["node"], + "description": "Show flashing lights." + }, { "key": "light:height", "object_types": ["node"],