From e8f53eb50caa85d472b4f876d5c48787aa0dae18 Mon Sep 17 00:00:00 2001 From: Antonio Locandro Date: Thu, 4 Jul 2013 10:01:35 -0600 Subject: [PATCH 1/3] Reorganization Reorganizing the folders into SLD and SVG-icons, added a few remarks on the Readme and a list of available icons --- README.md | 8 + .../fix_column_names.sql | 0 .../gt-main-9-SNAPSHOT.jar | Bin oam.style => SLD/oam.style | 0 oam_airspaces.sld => SLD/oam_airspaces.sld | 0 oam_airspaces.sldt => SLD/oam_airspaces.sldt | 0 oam_cities.sld => SLD/oam_cities.sld | 0 oam_cities.sldt => SLD/oam_cities.sldt | 0 .../oam_city_markers.sld | 0 .../oam_city_markers.sldt | 0 oam_forests.sld => SLD/oam_forests.sld | 0 oam_grid.sldt => SLD/oam_grid.sldt | 0 oam_labels.sld => SLD/oam_labels.sld | 0 oam_labels.sldt => SLD/oam_labels.sldt | 0 oam_navaids.sld => SLD/oam_navaids.sld | 0 oam_navaids.sldt => SLD/oam_navaids.sldt | 0 oam_peaks.sld => SLD/oam_peaks.sld | 0 oam_peaks.sldt => SLD/oam_peaks.sldt | 0 oam_roads.sld => SLD/oam_roads.sld | 0 oam_roads.sldt => SLD/oam_roads.sldt | 410 +++++++++--------- oam_runways.sld => SLD/oam_runways.sld | 0 oam_waters.sld => SLD/oam_waters.sld | 0 oam_waters.sldt => SLD/oam_waters.sldt | 166 +++---- .../remove_duplicate_navaids.sql | 0 .../121_navaid_designated_OAM.svg | 0 .../128_restricted_airspace_border_ICAO.svg | 0 .../CULTURE/080_church_OAM.svg | 0 .../MISCELLANEOUS/137_power_line_OAM.svg | 0 .../OBSTACLES/130_obstacle_ICAO.svg | 0 .../100_navaid_NDB_OAM.svg | 0 .../101_navaid_VOR_ICAO.svg | 0 .../103_navaid_VORDME_ICAO.svg | 68 +-- .../107_navaid_VORTAC_ICAO.svg | 0 .../110_navaid_compass_rose.svg | 0 SVG-icons/list of available icons.md | 21 + SVG-icons/list of available icons.txt | 21 + 36 files changed, 372 insertions(+), 322 deletions(-) rename fix_column_names.sql => SLD/fix_column_names.sql (100%) rename gt-main-9-SNAPSHOT.jar => SLD/gt-main-9-SNAPSHOT.jar (100%) rename oam.style => SLD/oam.style (100%) rename oam_airspaces.sld => SLD/oam_airspaces.sld (100%) rename oam_airspaces.sldt => SLD/oam_airspaces.sldt (100%) rename oam_cities.sld => SLD/oam_cities.sld (100%) rename oam_cities.sldt => SLD/oam_cities.sldt (100%) rename oam_city_markers.sld => SLD/oam_city_markers.sld (100%) rename oam_city_markers.sldt => SLD/oam_city_markers.sldt (100%) rename oam_forests.sld => SLD/oam_forests.sld (100%) rename oam_grid.sldt => SLD/oam_grid.sldt (100%) rename oam_labels.sld => SLD/oam_labels.sld (100%) rename oam_labels.sldt => SLD/oam_labels.sldt (100%) rename oam_navaids.sld => SLD/oam_navaids.sld (100%) rename oam_navaids.sldt => SLD/oam_navaids.sldt (100%) rename oam_peaks.sld => SLD/oam_peaks.sld (100%) rename oam_peaks.sldt => SLD/oam_peaks.sldt (100%) rename oam_roads.sld => SLD/oam_roads.sld (100%) rename oam_roads.sldt => SLD/oam_roads.sldt (97%) rename oam_runways.sld => SLD/oam_runways.sld (100%) rename oam_waters.sld => SLD/oam_waters.sld (100%) rename oam_waters.sldt => SLD/oam_waters.sldt (98%) rename remove_duplicate_navaids.sql => SLD/remove_duplicate_navaids.sql (100%) rename navaid_designated.svg => SVG-icons/AIR TRAFFIC SERVICES/121_navaid_designated_OAM.svg (100%) rename restricted_airspace_border.svg => SVG-icons/AIRSPACE RESTRICTIONS/128_restricted_airspace_border_ICAO.svg (100%) rename church.svg => SVG-icons/CULTURE/080_church_OAM.svg (100%) rename power_line.svg => SVG-icons/MISCELLANEOUS/137_power_line_OAM.svg (100%) rename obstacle.svg => SVG-icons/OBSTACLES/130_obstacle_ICAO.svg (100%) rename navaid_NDB.svg => SVG-icons/RADIO NAVIGATION AIDS/100_navaid_NDB_OAM.svg (100%) rename navaid_VOR.svg => SVG-icons/RADIO NAVIGATION AIDS/101_navaid_VOR_ICAO.svg (100%) rename navaid_VORDME.svg => SVG-icons/RADIO NAVIGATION AIDS/103_navaid_VORDME_ICAO.svg (98%) rename navaid_VORTAC.svg => SVG-icons/RADIO NAVIGATION AIDS/107_navaid_VORTAC_ICAO.svg (100%) rename navaid_compass_rose.svg => SVG-icons/RADIO NAVIGATION AIDS/110_navaid_compass_rose.svg (100%) create mode 100644 SVG-icons/list of available icons.md create mode 100644 SVG-icons/list of available icons.txt diff --git a/README.md b/README.md index d941433..5fd7c5a 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,11 @@ rendering Open Aviation Map rendering resources Describes the SLD styles in use for the project and has the SVG icons according to **ICAO SARPs** + +**Appendix 2. ICAO CHART SYMBOLS** is used for the development of the aeronautical symbols + +The `SVG-icons` folder has all the icons subdivided into subfolders a list of available icons is provided, the following convention is used + +XXX_name_ICAO - is an icon that complies with Annex 4 symbology + +XXX_name_OAM - is an icon slightly modified to be used in electronical charts of the *OAM* project diff --git a/fix_column_names.sql b/SLD/fix_column_names.sql similarity index 100% rename from fix_column_names.sql rename to SLD/fix_column_names.sql diff --git a/gt-main-9-SNAPSHOT.jar b/SLD/gt-main-9-SNAPSHOT.jar similarity index 100% rename from gt-main-9-SNAPSHOT.jar rename to SLD/gt-main-9-SNAPSHOT.jar diff --git a/oam.style b/SLD/oam.style similarity index 100% rename from oam.style rename to SLD/oam.style diff --git a/oam_airspaces.sld b/SLD/oam_airspaces.sld similarity index 100% rename from oam_airspaces.sld rename to SLD/oam_airspaces.sld diff --git a/oam_airspaces.sldt b/SLD/oam_airspaces.sldt similarity index 100% rename from oam_airspaces.sldt rename to SLD/oam_airspaces.sldt diff --git a/oam_cities.sld b/SLD/oam_cities.sld similarity index 100% rename from oam_cities.sld rename to SLD/oam_cities.sld diff --git a/oam_cities.sldt b/SLD/oam_cities.sldt similarity index 100% rename from oam_cities.sldt rename to SLD/oam_cities.sldt diff --git a/oam_city_markers.sld b/SLD/oam_city_markers.sld similarity index 100% rename from oam_city_markers.sld rename to SLD/oam_city_markers.sld diff --git a/oam_city_markers.sldt b/SLD/oam_city_markers.sldt similarity index 100% rename from oam_city_markers.sldt rename to SLD/oam_city_markers.sldt diff --git a/oam_forests.sld b/SLD/oam_forests.sld similarity index 100% rename from oam_forests.sld rename to SLD/oam_forests.sld diff --git a/oam_grid.sldt b/SLD/oam_grid.sldt similarity index 100% rename from oam_grid.sldt rename to SLD/oam_grid.sldt diff --git a/oam_labels.sld b/SLD/oam_labels.sld similarity index 100% rename from oam_labels.sld rename to SLD/oam_labels.sld diff --git a/oam_labels.sldt b/SLD/oam_labels.sldt similarity index 100% rename from oam_labels.sldt rename to SLD/oam_labels.sldt diff --git a/oam_navaids.sld b/SLD/oam_navaids.sld similarity index 100% rename from oam_navaids.sld rename to SLD/oam_navaids.sld diff --git a/oam_navaids.sldt b/SLD/oam_navaids.sldt similarity index 100% rename from oam_navaids.sldt rename to SLD/oam_navaids.sldt diff --git a/oam_peaks.sld b/SLD/oam_peaks.sld similarity index 100% rename from oam_peaks.sld rename to SLD/oam_peaks.sld diff --git a/oam_peaks.sldt b/SLD/oam_peaks.sldt similarity index 100% rename from oam_peaks.sldt rename to SLD/oam_peaks.sldt diff --git a/oam_roads.sld b/SLD/oam_roads.sld similarity index 100% rename from oam_roads.sld rename to SLD/oam_roads.sld diff --git a/oam_roads.sldt b/SLD/oam_roads.sldt similarity index 97% rename from oam_roads.sldt rename to SLD/oam_roads.sldt index 7abf1e5..84a815d 100644 --- a/oam_roads.sldt +++ b/SLD/oam_roads.sldt @@ -1,205 +1,205 @@ - - - - Roads - - Roads - - - - - tertiary - - - - highway - tertiary - - - highway - unclassified - - - - - - #000000 - 0.3mm - - - - - - - - secondary - - - - highway - secondary - - - highway - highway_link - - - highway - motorway_link - - - highway - trunk_link - - - - - - #000000 - 0.4mm - - - - - - - - highway-outer - - - highway - primary - - - - - #000000 - 0.5mm - round - - - - - - - highway-inner - - - highway - primary - - - - - #FFFFFF - 0.4mm - round - - - - - - - - motorway - - - - highway - motorway - - - highway - trunk - - - - - - #B7943C - 0.5mm - round - - - - - - - - railway - - - - railway - rail - - - railway - light_rail - - - - - - #000000 - 0.5mm - - - - - #000000 - 1.5mm - 0.1mm 7mm - - - - - - - - power lines - - - - power - line - - - power - minor_line - - - - - - #FF0000 - 0.05mm - - - - - - - - - image/svg+xml - - 5mm - - - 5mm 30mm - 5mm - - - - - - - - + + + + Roads + + Roads + + + + + tertiary + + + + highway + tertiary + + + highway + unclassified + + + + + + #000000 + 0.3mm + + + + + + + + secondary + + + + highway + secondary + + + highway + highway_link + + + highway + motorway_link + + + highway + trunk_link + + + + + + #000000 + 0.4mm + + + + + + + + highway-outer + + + highway + primary + + + + + #000000 + 0.5mm + round + + + + + + + highway-inner + + + highway + primary + + + + + #FFFFFF + 0.4mm + round + + + + + + + + motorway + + + + highway + motorway + + + highway + trunk + + + + + + #B7943C + 0.5mm + round + + + + + + + + railway + + + + railway + rail + + + railway + light_rail + + + + + + #000000 + 0.5mm + + + + + #000000 + 1.5mm + 0.1mm 7mm + + + + + + + + power lines + + + + power + line + + + power + minor_line + + + + + + #FF0000 + 0.05mm + + + + + + + + + image/svg+xml + + 5mm + + + 5mm 30mm + 5mm + + + + + + + + diff --git a/oam_runways.sld b/SLD/oam_runways.sld similarity index 100% rename from oam_runways.sld rename to SLD/oam_runways.sld diff --git a/oam_waters.sld b/SLD/oam_waters.sld similarity index 100% rename from oam_waters.sld rename to SLD/oam_waters.sld diff --git a/oam_waters.sldt b/SLD/oam_waters.sldt similarity index 98% rename from oam_waters.sldt rename to SLD/oam_waters.sldt index 5acf229..61c86a4 100644 --- a/oam_waters.sldt +++ b/SLD/oam_waters.sldt @@ -1,83 +1,83 @@ - - - - Open Aviation Map waters - - Waters - - - - Water - - - - - waterway - riverbank - - - waterway - canal - - - water - lake - - - water - pond - - - water - reservoir - - - natural - water - - - natural - lake - - - landuse - reservoir - - - landuse - basin - - - - - - #9FCBFF - - - #1D27F6 - 0.1mm - - - - - - - Wetland - - - - natural - wetland - - - - - #E0ECF6 - - - - - - - - + + + + Open Aviation Map waters + + Waters + + + + Water + + + + + waterway + riverbank + + + waterway + canal + + + water + lake + + + water + pond + + + water + reservoir + + + natural + water + + + natural + lake + + + landuse + reservoir + + + landuse + basin + + + + + + #9FCBFF + + + #1D27F6 + 0.1mm + + + + + + + Wetland + + + + natural + wetland + + + + + #E0ECF6 + + + + + + + + diff --git a/remove_duplicate_navaids.sql b/SLD/remove_duplicate_navaids.sql similarity index 100% rename from remove_duplicate_navaids.sql rename to SLD/remove_duplicate_navaids.sql diff --git a/navaid_designated.svg b/SVG-icons/AIR TRAFFIC SERVICES/121_navaid_designated_OAM.svg similarity index 100% rename from navaid_designated.svg rename to SVG-icons/AIR TRAFFIC SERVICES/121_navaid_designated_OAM.svg diff --git a/restricted_airspace_border.svg b/SVG-icons/AIRSPACE RESTRICTIONS/128_restricted_airspace_border_ICAO.svg similarity index 100% rename from restricted_airspace_border.svg rename to SVG-icons/AIRSPACE RESTRICTIONS/128_restricted_airspace_border_ICAO.svg diff --git a/church.svg b/SVG-icons/CULTURE/080_church_OAM.svg similarity index 100% rename from church.svg rename to SVG-icons/CULTURE/080_church_OAM.svg diff --git a/power_line.svg b/SVG-icons/MISCELLANEOUS/137_power_line_OAM.svg similarity index 100% rename from power_line.svg rename to SVG-icons/MISCELLANEOUS/137_power_line_OAM.svg diff --git a/obstacle.svg b/SVG-icons/OBSTACLES/130_obstacle_ICAO.svg similarity index 100% rename from obstacle.svg rename to SVG-icons/OBSTACLES/130_obstacle_ICAO.svg diff --git a/navaid_NDB.svg b/SVG-icons/RADIO NAVIGATION AIDS/100_navaid_NDB_OAM.svg similarity index 100% rename from navaid_NDB.svg rename to SVG-icons/RADIO NAVIGATION AIDS/100_navaid_NDB_OAM.svg diff --git a/navaid_VOR.svg b/SVG-icons/RADIO NAVIGATION AIDS/101_navaid_VOR_ICAO.svg similarity index 100% rename from navaid_VOR.svg rename to SVG-icons/RADIO NAVIGATION AIDS/101_navaid_VOR_ICAO.svg diff --git a/navaid_VORDME.svg b/SVG-icons/RADIO NAVIGATION AIDS/103_navaid_VORDME_ICAO.svg similarity index 98% rename from navaid_VORDME.svg rename to SVG-icons/RADIO NAVIGATION AIDS/103_navaid_VORDME_ICAO.svg index a5956be..32f5af4 100644 --- a/navaid_VORDME.svg +++ b/SVG-icons/RADIO NAVIGATION AIDS/103_navaid_VORDME_ICAO.svg @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navaid_VORTAC.svg b/SVG-icons/RADIO NAVIGATION AIDS/107_navaid_VORTAC_ICAO.svg similarity index 100% rename from navaid_VORTAC.svg rename to SVG-icons/RADIO NAVIGATION AIDS/107_navaid_VORTAC_ICAO.svg diff --git a/navaid_compass_rose.svg b/SVG-icons/RADIO NAVIGATION AIDS/110_navaid_compass_rose.svg similarity index 100% rename from navaid_compass_rose.svg rename to SVG-icons/RADIO NAVIGATION AIDS/110_navaid_compass_rose.svg diff --git a/SVG-icons/list of available icons.md b/SVG-icons/list of available icons.md new file mode 100644 index 0000000..0d4be53 --- /dev/null +++ b/SVG-icons/list of available icons.md @@ -0,0 +1,21 @@ +**AIR TRAFFIC SERVICES** + 121_navaid_designated_OAM + +**AIRSPACE RESTRICTIONS** + 128_restricted_airspace_border_ICAO + +**CULTURE** + 080_church_OAM + +**MISCELLANEOUS** + 137_power_line_OAM + +**OBSTACLES** + 130_obstacle_ICAO + +**RADIO NAVIGATION AIDS** + 100_navaid_NDB_OAM + 101_navaid_VOR_ICAO + 103_navaid_VORDME_ICAO + 107_navaid_VORTAC_ICAO + 110_navaid_compass_rose \ No newline at end of file diff --git a/SVG-icons/list of available icons.txt b/SVG-icons/list of available icons.txt new file mode 100644 index 0000000..8c191ac --- /dev/null +++ b/SVG-icons/list of available icons.txt @@ -0,0 +1,21 @@ +AIR TRAFFIC SERVICES + 121_navaid_designated_OAM + +AIRSPACE RESTRICTIONS + 128_restricted_airspace_border_ICAO + +CULTURE + 080_church_OAM + +MISCELLANEOUS + 137_power_line_OAM + +OBSTACLES + 130_obstacle_ICAO + +RADIO NAVIGATION AIDS + 100_navaid_NDB_OAM + 101_navaid_VOR_ICAO + 103_navaid_VORDME_ICAO + 107_navaid_VORTAC_ICAO + 110_navaid_compass_rose \ No newline at end of file From 43db57b744d07219fbed1072aaa8e4dc4d3f40e4 Mon Sep 17 00:00:00 2001 From: Antonio Locandro Date: Thu, 4 Jul 2013 10:03:56 -0600 Subject: [PATCH 2/3] cleaning --- SVG-icons/list of available icons.txt | 21 ------------------- .../{list of available icons.md => readme.md} | 0 2 files changed, 21 deletions(-) delete mode 100644 SVG-icons/list of available icons.txt rename SVG-icons/{list of available icons.md => readme.md} (100%) diff --git a/SVG-icons/list of available icons.txt b/SVG-icons/list of available icons.txt deleted file mode 100644 index 8c191ac..0000000 --- a/SVG-icons/list of available icons.txt +++ /dev/null @@ -1,21 +0,0 @@ -AIR TRAFFIC SERVICES - 121_navaid_designated_OAM - -AIRSPACE RESTRICTIONS - 128_restricted_airspace_border_ICAO - -CULTURE - 080_church_OAM - -MISCELLANEOUS - 137_power_line_OAM - -OBSTACLES - 130_obstacle_ICAO - -RADIO NAVIGATION AIDS - 100_navaid_NDB_OAM - 101_navaid_VOR_ICAO - 103_navaid_VORDME_ICAO - 107_navaid_VORTAC_ICAO - 110_navaid_compass_rose \ No newline at end of file diff --git a/SVG-icons/list of available icons.md b/SVG-icons/readme.md similarity index 100% rename from SVG-icons/list of available icons.md rename to SVG-icons/readme.md From f82dab33b2efe9711630f012cace0c25a7d4ca83 Mon Sep 17 00:00:00 2001 From: Antonio Locandro Date: Thu, 4 Jul 2013 10:05:51 -0600 Subject: [PATCH 3/3] cleaning --- SVG-icons/readme.md | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/SVG-icons/readme.md b/SVG-icons/readme.md index 0d4be53..8c2eb1a 100644 --- a/SVG-icons/readme.md +++ b/SVG-icons/readme.md @@ -1,21 +1,31 @@ **AIR TRAFFIC SERVICES** - 121_navaid_designated_OAM + + -121_navaid_designated_OAM **AIRSPACE RESTRICTIONS** - 128_restricted_airspace_border_ICAO + + -128_restricted_airspace_border_ICAO **CULTURE** - 080_church_OAM + + -080_church_OAM **MISCELLANEOUS** - 137_power_line_OAM + + -137_power_line_OAM **OBSTACLES** - 130_obstacle_ICAO + + -130_obstacle_ICAO **RADIO NAVIGATION AIDS** - 100_navaid_NDB_OAM - 101_navaid_VOR_ICAO - 103_navaid_VORDME_ICAO - 107_navaid_VORTAC_ICAO - 110_navaid_compass_rose \ No newline at end of file + + -100_navaid_NDB_OAM + + -101_navaid_VOR_ICAO + + -103_navaid_VORDME_ICAO + + -107_navaid_VORTAC_ICAO + + -110_navaid_compass_rose \ No newline at end of file