nswtopo-layers 1.0.0 → 1.0.1

data/layers/nsw/topographic/sand.yml

@@ -1,7 +1,7 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: Cliffs_Reefs_Mangroves
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Physiography_Category/MapServer
+  layer: DLSArea
   where: classsubtype IN (6,7)
   category: classsubtype
 Rock-Inland:

data/layers/nsw/topographic/spot-heights.yml

@@ -1,6 +1,6 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Elevation_and_Depth_Theme/MapServer
   layer: SpotHeight
   label: elevation
 symbol:

data/layers/nsw/topographic/state-border.yml

@@ -3,6 +3,7 @@ features:
   source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
   layer: State_Border
 opacity: 0.5
+preserve: true
 dupe: hatching
 stroke: black
 stroke-width: 0.3

data/layers/nsw/topographic/stock-dams.yml

@@ -1,7 +1,7 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: StockDams
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Water_Theme/MapServer
+  layer: HydroPoint
   category: hydrotype
 ManMadeWaterBody:
   symbol:

data/layers/nsw/topographic/swamps.yml

@@ -1,9 +1,10 @@
 type: Feature
 features:
-- source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: Swamps_LSI
+- source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Physiography_Category/MapServer
+  layer: DLSArea
   category: classsubtype
   where: classsubtype IN (8,9)
+# TODO: use portal.spatial.nsw.gov.au
 - source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/POI/MapServer/0
   where: poitype = 'Swamp'
   draw: false

data/layers/nsw/topographic/tanks.yml

@@ -1,7 +1,9 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/RFS/MapServer
+- source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Features_of_Interest_Category/MapServer
   layer: TankPoint
+- source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Features_of_Interest_Category/MapServer
+  layer: TankArea
 stroke: black
 stroke-width: 0.1
 fill: white

data/layers/nsw/topographic/towers.yml

@@ -1,7 +1,7 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: Beacon_Tower
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Features_of_Interest_Category/MapServer
+  layer: GeneralCulturalPoint
   where: classsubtype = 7
 symbol:
   circle:

data/layers/nsw/topographic/transmission-lines.yml

@@ -1,7 +1,7 @@
 type: Feature
 features:
-  source: https://maptest.environment.nsw.gov.au/arcgis/rest/services/basemap/OEHBasemapnpws_WSG84/MapServer
-  layer: Topo.SDE.ElectricityTransmissionLine
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Features_of_Interest_Category/MapServer
+  layer: ElectricityTransmissionLine
 fence: true
 dupe: dots
 stroke: black

data/layers/nsw/topographic/urban-areas.yml

@@ -1,6 +1,7 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: Urban
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Features_of_Interest_Category/MapServer
+  layer: GeneralCulturalArea
+  where: classsubtype = 7
 stroke: none
 fill: "#FFFABD"

data/layers/nsw/topographic/water-area-labels.yml

@@ -1,3 +1,4 @@
+# # TODO: use portal.spatial.nsw.gov.au
 type: Feature
 features:
   source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/POI/MapServer/0

data/layers/nsw/topographic/water-areas.yml

@@ -1,10 +1,10 @@
 type: Feature
 features:
-- source: https://maps.six.nsw.gov.au/arcgis/rest/services/public/NSW_Hydrography/MapServer
+- source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Water_Theme/MapServer
   layer: HydroArea
   category: perenniality
-- source: https://maps.six.nsw.gov.au/arcgis/rest/services/public/NSW_Hydrography/MapServer
-  layer: Oceans_Bays
+- source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Water_Theme/MapServer
+  layer: FuzzyExtentWaterArea
   where: classsubtype = 3
   category: classsubtype
 order:
@@ -19,10 +19,12 @@ Perennial:
   fill: "#B3E6E4"
   stroke: none
   mask: true
+  preserve: true
 outline Perennial:
   stroke: "#4985DF"
   stroke-width: 0.24
   fill: none
+  preserve: false
 [NonPerennial, MainlyDry]:
   stroke: "#4985DF"
   stroke-width: 0.12

data/layers/nsw/topographic/watercourse-labels.yml

@@ -1,13 +1,9 @@
 type: Feature
 features:
-- source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: Stream_Names
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Water_Theme/MapServer
+  layer: NamedWatercourse
   category: relevance
-  draw: false
   label: hydronamestring
-- fallback: true
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/public/NSW_Hydrography/MapServer
-  layer: Named Watercourse LS
 labels:
   font-family: Arial, Helvetica, sans-serif
   font-style: italic

data/layers/nsw/topographic/watercourses.yml

@@ -1,11 +1,12 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/public/NSW_Hydrography/MapServer
-  layer: Hydroline
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Water_Theme/MapServer
+  layer: HydroLine
   where:
   - classsubtype = 1
   - hydrotype NOT IN (5, 6)
   category: relevance
+  per_page: 250
 bezier: 0.5
 stroke: "#4985DF"
 [1, 2, 3, 4]:

data/layers/nsw/topographic/waterfalls.yml

@@ -1,10 +1,11 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: Waterfalls_springs
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Water_Theme/MapServer
+  layer: AncillaryHydroPoint
   where: ancillaryhydrotype = 6
   rotation: 90 - symbolrotation
   label: generalname
+  # TODO: ancillaryhydrotype = 3 gives rapids
 unrotated:
   symbol:
     circle:

data/layers/nsw/topographic/wharves-ramps-slipways.yml

@@ -1,6 +1,7 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: Wharfs_Ramps
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Transport_Theme/MapServer
+  layer: TransportFacilityLine
+  where: classsubtype IN (1,2,3)
 stroke: black
 stroke-width: 0.25

data/layers/nsw/topographic/yards-quarries-windmills.yml

@@ -1,7 +1,7 @@
 type: Feature
 features:
-  source: https://maps.six.nsw.gov.au/arcgis/rest/services/sixmaps/LPIMap/MapServer
-  layer: Beacon_Tower
+  source: https://portal.spatial.nsw.gov.au/server/rest/services/NSW_Features_of_Interest_Category/MapServer
+  layer: GeneralCulturalPoint
   where:
   - classsubtype = 4
   - generalculturaltype IN (8,9,11,12)

data/layers/nsw/topographic.yml

@@ -32,6 +32,7 @@
 - topographic/racetracks
 - topographic/fences
 - topographic/conveyors
+- topographic/ferry-routes
 - topographic/floodways
 - topographic/roads
 - topographic/road-labels
@@ -46,9 +47,10 @@
 - topographic/beacons
 - topographic/towers
 - topographic/yards-quarries-windmills
+- topographic/cableways
 - topographic/transmission-lines
 - topographic/state-border
-- topographic/relative-heights
+- topographic/relative-height-labels
 - topographic/geographic-line-labels
 - topographic/geographic-point-labels
 - topographic/place-labels

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: nswtopo-layers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matthew Hollingworth
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nswtopo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -45,6 +45,7 @@ files:
 - layers/nsw/topographic/beacons.yml
 - layers/nsw/topographic/breakwaters.yml
 - layers/nsw/topographic/buildings.yml
+- layers/nsw/topographic/cableways.yml
 - layers/nsw/topographic/cadastre.yml
 - layers/nsw/topographic/caves-pinnacles.yml
 - layers/nsw/topographic/cliffs.yml
@@ -55,6 +56,7 @@ files:
 - layers/nsw/topographic/dam-walls-spillways.yml
 - layers/nsw/topographic/excavation.yml
 - layers/nsw/topographic/fences.yml
+- layers/nsw/topographic/ferry-routes.yml
 - layers/nsw/topographic/floodways.yml
 - layers/nsw/topographic/gates-grids.yml
 - layers/nsw/topographic/geographic-line-labels.yml
@@ -73,7 +75,7 @@ files:
 - layers/nsw/topographic/railway-tunnels.yml
 - layers/nsw/topographic/railways.yml
 - layers/nsw/topographic/reefs-rocks.yml
-- layers/nsw/topographic/relative-heights.yml
+- layers/nsw/topographic/relative-height-labels.yml
 - layers/nsw/topographic/reserves.yml
 - layers/nsw/topographic/road-bridges.yml
 - layers/nsw/topographic/road-labels.yml
@@ -99,18 +101,12 @@ files:
 - layers/nsw/topographic/yards-quarries-windmills.yml
 - layers/nsw/vegetation-2008-v2.yml
 - layers/nsw/vegetation-spot5.yml
-- layers/tas/orthophoto.yml
-- layers/tas/relief.yml
-- layers/tas/reserves.yml
-- layers/tas/tasmap-raster.yml
-- layers/tas/tasveg.yml
-- layers/tas/topographic.yml
 - lib/nswtopo/layers.rb
 homepage: https://github.com/mholling/nswtopo-layers
 licenses:
 - CC-BY-NC-SA-4.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Layer definitions for nswtopo
 test_files: []

data/layers/tas/orthophoto.yml

@@ -1,7 +0,0 @@
-class: ArcGISRaster
-host: services.thelist.tas.gov.au
-folder: Basemaps
-service: Orthophoto
-ext: png
-image: true
-resolution: 2.0

data/layers/tas/relief.yml

@@ -1,9 +0,0 @@
-type: Relief
-contours:
-  http://services.thelist.tas.gov.au/arcgis/rest/services/Public/OpenDataWFS/MapServer/16: ELEVATION
-  http://services.thelist.tas.gov.au/arcgis/rest/services/Public/OpenDataWFS/MapServer/15: 0
-resolution: 15
-sources: 3
-factor: 2.0
-altitude: 35
-opacity: 0.25

data/layers/tas/reserves.yml

@@ -1,41 +0,0 @@
-class: ArcGISVector
-sources:
-  cadastre-administrative:
-    host: services.thelist.tas.gov.au
-    folder: Public
-    service: CadastreAndAdministrative
-features:
-  boundaries:
-    # TODO: add marine reserves without labels?
-    source: cadastre-administrative
-    name: Tasmanian Reserve Estate
-    where:
-    - RES_CLASS IN ('Conservation Area','National Park','Nature Reserve','Private Sanctuary','Regional Reserve','State Reserve','Wellington Park')
-    - ENVIRON IN ('Terrestrial')
-    category: RES_CLASS
-    label: RES_NAME
-boundaries:
-  opacity: 0.5
-  fill: none
-  stroke: "#008800"
-  stroke-width: 0.4
-labels:
-  dupe: outline
-  stroke: none
-  font-style: italic
-  font-family: Arial, Helvetica, sans-serif
-  outline:
-    stroke: white
-    fill: none
-    stroke-width: 0.5
-    stroke-opacity: 0.5
-  boundaries:
-    minimum-area: 800
-    buffer: [ -6.5, 0 ]
-    separation: 150
-    font-size: 2.5
-    letter-spacing: 0.3
-    fill: "#008800"
-    fill-opacity: 0.5
-    font-weight: bold
-    font-style: normal

data/layers/tas/tasmap-raster.yml

@@ -1,7 +0,0 @@
-class: ArcGISRaster
-host: services.thelist.tas.gov.au
-folder: Basemaps
-service: TasmapRaster
-ext: png
-image: true
-resolution: 2.0