From 03d0907de6243284661d6829474e7f4aace06659 Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 15:18:57 +0800 Subject: [PATCH 01/11] Create weather --- .../man_made/monitoring_station/weather | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 data/presets/man_made/monitoring_station/weather diff --git a/data/presets/man_made/monitoring_station/weather b/data/presets/man_made/monitoring_station/weather new file mode 100644 index 00000000..37b30e79 --- /dev/null +++ b/data/presets/man_made/monitoring_station/weather @@ -0,0 +1,35 @@ +{ + "icon": "temaki-antenna", + "geometry": [ + "point", + "vertex", + "area" + ], + "fields": [ + "{man_made/monitoring_station}", + "weather_multi" + ], + "moreFields": [ + "{man_made/monitoring_station}" + ], + "terms": [ + "weather", + "air", + "ceilometer", + "humidity", + "lightning", + "rain", + "temperature", + "wind", + "measurement station" + ], + "tags": { + "man_made": "monitoring_station", + "monitoring:weather": "yes" + }, + "reference": { + "key": "man_made", + "value": "monitoring_station" + }, + "name": "Weather Station" +} From 19b7035348c24d8e67783c50656346c201af5957 Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 15:19:38 +0800 Subject: [PATCH 02/11] Rename weather to weather.json --- .../presets/man_made/monitoring_station/{weather => weather.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/presets/man_made/monitoring_station/{weather => weather.json} (100%) diff --git a/data/presets/man_made/monitoring_station/weather b/data/presets/man_made/monitoring_station/weather.json similarity index 100% rename from data/presets/man_made/monitoring_station/weather rename to data/presets/man_made/monitoring_station/weather.json From 8dd477a3c2c692013b7a8d77b63f80246058855f Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 15:32:42 +0800 Subject: [PATCH 03/11] Create weather_multi.json --- data/fields/weather_multi.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 data/fields/weather_multi.json diff --git a/data/fields/weather_multi.json b/data/fields/weather_multi.json new file mode 100644 index 00000000..4d28fbcd --- /dev/null +++ b/data/fields/weather_multi.json @@ -0,0 +1,29 @@ +{ + "key": "weather:", + "type": "multiCombo", + "label": "Weather Instruments", + "strings": { + "options": { + "barometer": "Barometer", + "ceilometer": "Ceilometer", + "humidity_sensor": "Humidity Sensor", + "psychrometer": "Psychrometer", + "Lightning_detector": "Lightning Detector", + "rain_gauge": "Rain Gauge", + "precipitation_indicator": "Precipitation Indicator", + "radar": "Radar", + "snow_height_sensor": "Snow Height Sensor", + "pyranometer": "Pyranometer", + "pyrgeometer": "Pyrgeometer", + "pyrheliometer": "Pyrheliometer", + "sunshine_recorder": "Sunshine Recorder", + "grass_minimum_thermometer": "Grass Minimum Thermometer", + "soil_thermometer": "Soil Thermometer", + "thermometer": "Thermometer", + "radiosonde": "Radiosonde", + "forward_scatter_sensor": "Forward Scatter Sensor", + "transmissometer": "Transmissometer", + "anemometer": "Anemometer" + } + } +} From 70bb9ff62e81ab8d1b67f9034928c4ab0388da14 Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 21:21:44 +0800 Subject: [PATCH 04/11] add name and ele --- data/presets/man_made/monitoring_station/weather.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/presets/man_made/monitoring_station/weather.json b/data/presets/man_made/monitoring_station/weather.json index 37b30e79..72c4366f 100644 --- a/data/presets/man_made/monitoring_station/weather.json +++ b/data/presets/man_made/monitoring_station/weather.json @@ -6,22 +6,24 @@ "area" ], "fields": [ + "name", "{man_made/monitoring_station}", - "weather_multi" + "weather_multi", + "ele" ], "moreFields": [ "{man_made/monitoring_station}" ], "terms": [ - "weather", "air", "ceilometer", "humidity", "lightning", + "measurement station", "rain", "temperature", - "wind", - "measurement station" + "weather", + "wind" ], "tags": { "man_made": "monitoring_station", From c261aa70d16b2d76381b0e7589016762ad337f80 Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 21:28:51 +0800 Subject: [PATCH 05/11] add options and sort A-Z in weather_multi.json --- data/fields/weather_multi.json | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/data/fields/weather_multi.json b/data/fields/weather_multi.json index 4d28fbcd..dd5a64de 100644 --- a/data/fields/weather_multi.json +++ b/data/fields/weather_multi.json @@ -4,26 +4,29 @@ "label": "Weather Instruments", "strings": { "options": { + "anemometer": "Anemometer", "barometer": "Barometer", "ceilometer": "Ceilometer", + "forward_scatter_sensor": "Forward Scatter Sensor", + "grass_minimum_thermometer": "Grass Minimum Thermometer", "humidity_sensor": "Humidity Sensor", - "psychrometer": "Psychrometer", - "Lightning_detector": "Lightning Detector", - "rain_gauge": "Rain Gauge", + "hygrometer": "Hygrometer", + "lightning_detector": "Lightning Detector", "precipitation_indicator": "Precipitation Indicator", - "radar": "Radar", - "snow_height_sensor": "Snow Height Sensor", + "psychrometer": "Psychrometer", "pyranometer": "Pyranometer", "pyrgeometer": "Pyrgeometer", "pyrheliometer": "Pyrheliometer", - "sunshine_recorder": "Sunshine Recorder", - "grass_minimum_thermometer": "Grass Minimum Thermometer", - "soil_thermometer": "Soil Thermometer", - "thermometer": "Thermometer", + "radar": "Radar", "radiosonde": "Radiosonde", - "forward_scatter_sensor": "Forward Scatter Sensor", + "rain_gauge": "Rain Gauge", + "snow_height_sensor": "Snow Height Sensor", + "snow_stick": "Snow Stick", + "soil_thermometer": "Soil Thermometer", + "sunshine_recorder": "Sunshine Recorder", + "thermometer": "Thermometer", "transmissometer": "Transmissometer", - "anemometer": "Anemometer" + "wind_vane": "Wind Vane" } } } From a649888d6e9718d8321c06b4b10bec4a3a223388 Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 22:09:20 +0800 Subject: [PATCH 06/11] Create wmo.json --- data/fields/ref/wmo.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/fields/ref/wmo.json diff --git a/data/fields/ref/wmo.json b/data/fields/ref/wmo.json new file mode 100644 index 00000000..27698195 --- /dev/null +++ b/data/fields/ref/wmo.json @@ -0,0 +1,5 @@ +{ + "key": "ref:wmo", + "type": "text", + "label": "WMO Station ID" +} From 6e34cab80edc6326bda25d141bd8815ffb68f011 Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 22:10:13 +0800 Subject: [PATCH 07/11] Create wigos.json --- data/fields/ref/wigos.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/fields/ref/wigos.json diff --git a/data/fields/ref/wigos.json b/data/fields/ref/wigos.json new file mode 100644 index 00000000..30fe726b --- /dev/null +++ b/data/fields/ref/wigos.json @@ -0,0 +1,5 @@ +{ + "key": "ref:wmo", + "type": "text", + "label": "WIGOS ID" +} From be6e5c8d0f6dc34d93a41def927f5d24eade6310 Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 22:13:15 +0800 Subject: [PATCH 08/11] Update wigos.json --- data/fields/ref/wigos.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/ref/wigos.json b/data/fields/ref/wigos.json index 30fe726b..c1083d66 100644 --- a/data/fields/ref/wigos.json +++ b/data/fields/ref/wigos.json @@ -1,5 +1,5 @@ { - "key": "ref:wmo", + "key": "ref:wigos", "type": "text", "label": "WIGOS ID" } From 3b7c68de9e7b58ccc85f5f133b11ddd2d2d26266 Mon Sep 17 00:00:00 2001 From: novoLife Date: Fri, 23 May 2025 22:15:55 +0800 Subject: [PATCH 09/11] add ref:wmo and ref:wigos to weather station --- data/presets/man_made/monitoring_station/weather.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/presets/man_made/monitoring_station/weather.json b/data/presets/man_made/monitoring_station/weather.json index 72c4366f..ecf4245a 100644 --- a/data/presets/man_made/monitoring_station/weather.json +++ b/data/presets/man_made/monitoring_station/weather.json @@ -12,6 +12,8 @@ "ele" ], "moreFields": [ + "ref/wmo", + "ref/wigos", "{man_made/monitoring_station}" ], "terms": [ From 213eda1500bb1d573afe4373ac30a4a742dfa483 Mon Sep 17 00:00:00 2001 From: novoLife Date: Sun, 25 May 2025 01:36:24 +0800 Subject: [PATCH 10/11] add terms to monitoring_multi --- data/fields/monitoring_multi.json | 37 ++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/data/fields/monitoring_multi.json b/data/fields/monitoring_multi.json index dd9630bf..9c5edd47 100644 --- a/data/fields/monitoring_multi.json +++ b/data/fields/monitoring_multi.json @@ -1,5 +1,40 @@ { "key": "monitoring:", "type": "multiCombo", - "label": "Monitoring" + "label": "Monitoring", + "strings": { + "options": { + "air_humidity": "Air Humidity", + "air_pressure": "Air Pressure", + "air_quality": "Air Quality", + "air_temperature": "Air Temperature", + "bicycle": "Bicycle", + "cosmic_ray": "Cosmic Ray", + "dissolved_oxygen": "Dissolved Oxygen", + "flow_rate": "Flow_rate", + "glonass": "GLONASS", + "gps": "GPS", + "groundwater": "Groundwater", + "groundwater_level": "Groundwater Level", + "humidity": "Humidity", + "particulate_matter": "Particulate Matter", + "precipitation": "Precipitation", + "radiation": "Radiation", + "rainfall": "Rainfall", + "salinity": "Salinity", + "seismic_activity": "Earthquake", + "tide_gauge": "Tide Gauge", + "traffic": "Traffic", + "water_conductivity": "Water Conductivity", + "water_level": "Water Level", + "water_pH": "Water pH", + "water_quality": "Water Quality", + "water_temperature": "Water Temperature", + "water_turbidity": "Water Turbidity", + "wind": "Wind", + "wind_speed": "Wind Speed", + "wind_direction": "Wind Direction", + "weather": "Weather" + } + } } From 3a4d53781380766081d2bfe8a1e4dfd5a3342626 Mon Sep 17 00:00:00 2001 From: novoLife Date: Wed, 4 Jun 2025 14:42:28 +0800 Subject: [PATCH 11/11] remove duplicate field --- data/presets/man_made/monitoring_station/weather.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/presets/man_made/monitoring_station/weather.json b/data/presets/man_made/monitoring_station/weather.json index ecf4245a..ee7cd334 100644 --- a/data/presets/man_made/monitoring_station/weather.json +++ b/data/presets/man_made/monitoring_station/weather.json @@ -13,8 +13,7 @@ ], "moreFields": [ "ref/wmo", - "ref/wigos", - "{man_made/monitoring_station}" + "ref/wigos" ], "terms": [ "air",