nswtopo 2.0.0.pre.beta1 → 3.0

data/lib/nswtopo.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'time'
 require 'open3'
 require 'uri'
 require 'net/http'
@@ -17,11 +18,7 @@ require 'ostruct'
 require 'forwardable'
 require 'rubygems/package'
 require 'zlib'
-begin
-  require 'pty'
-  require 'expect'
-rescue LoadError
-end
+require 'io/nonblock'
 
 require_relative 'nswtopo/helpers'
 require_relative 'nswtopo/avl_tree'
@@ -31,216 +28,26 @@ require_relative 'nswtopo/safely'
 require_relative 'nswtopo/os'
 require_relative 'nswtopo/dither'
 require_relative 'nswtopo/zip'
+require_relative 'nswtopo/chrome'
 require_relative 'nswtopo/font'
 require_relative 'nswtopo/archive'
 require_relative 'nswtopo/gis'
+require_relative 'nswtopo/tiled_web_map'
 require_relative 'nswtopo/formats'
 require_relative 'nswtopo/map'
 require_relative 'nswtopo/layer'
 require_relative 'nswtopo/version'
 require_relative 'nswtopo/config'
+require_relative 'nswtopo/commands'
+require_relative 'nswtopo/tree_indenter'
 
 module NSWTopo
   PartialFailureError = Class.new RuntimeError
   extend self, Log
 
-  def init(archive, options)
-    puts Map.init(archive, options)
-  end
-
   def layer_dirs
     @layer_dirs ||= Array(Config["layer-dir"]).map(&Pathname.method(:new)) << Pathname.pwd
   end
-
-  def info(archive, options)
-    puts Map.load(archive).info(options)
-  end
-
-  def add(archive, *layers, options)
-    create_options = {
-      after: Layer.sanitise(options.delete :after),
-      before: Layer.sanitise(options.delete :before),
-      replace: Layer.sanitise(options.delete :replace),
-      overwrite: options.delete(:overwrite)
-    }
-    map = Map.load archive
-
-    Enumerator.new do |yielder|
-      while layers.any?
-        layer, basedir = layers.shift
-        path = Pathname(layer).expand_path(*basedir)
-        case layer
-        when /^controls\.(gpx|kml)$/i
-          yielder << [path.basename(path.extname).to_s, "type" => "Control", "path" => path]
-        when /\.(gpx|kml)$/i
-          yielder << [path.basename(path.extname).to_s, "type" => "Overlay", "path" => path]
-        when /\.(tiff?|png|jpg)$/i
-          yielder << [path.basename(path.extname).to_s, "type" => "Import", "path" => path]
-        when "contours"
-          yielder << [layer, "type" => "Contour"]
-        when "spot-heights"
-          yielder << [layer, "type" => "Spot"]
-        when "relief"
-          yielder << [layer, "type" => "Relief"]
-        when "grid"
-          yielder << [layer, "type" => "Grid"]
-        when "declination"
-          yielder << [layer, "type" => "Declination"]
-        when "controls"
-          yielder << [layer, "type" => "Control"]
-        when /\.yml$/i
-          basedir ||= path.parent
-          raise "couldn't find '#{layer}'" unless path.file?
-          case contents = YAML.load(path.read)
-          when Array
-            contents.reverse.map do |item|
-              Pathname(item.to_s)
-            end.each do |relative_path|
-              raise "#{relative_path} is not a relative path" unless relative_path.relative?
-              layers.prepend [Pathname(relative_path).expand_path(path.parent).relative_path_from(basedir).to_s, basedir]
-            end
-          when Hash
-            name = path.sub_ext("").relative_path_from(basedir).descend.map(&:basename).join(?.)
-            yielder << [name, contents.merge("source" => path)]
-          else
-            raise "couldn't parse #{path}"
-          end
-        else
-          path = Pathname("#{layer}.yml")
-          raise "#{layer} is not a relative path" unless path.relative?
-          basedir ||= layer_dirs.find do |root|
-            path.expand_path(root).file?
-          end
-          layers.prepend [path.to_s, basedir]
-        end
-      end
-    rescue YAML::Exception
-      raise "couldn't parse #{path}"
-    end.map do |name, params|
-      params.merge! options.transform_keys(&:to_s)
-      params.merge! Config[name] if Config[name]
-      Layer.new(name, map, params)
-    end.tap do |layers|
-      raise OptionParser::MissingArgument, "no layers specified" unless layers.any?
-      unless layers.one?
-        raise OptionParser::InvalidArgument, "can't specify resolution when adding multiple layers" if options[:resolution]
-        raise OptionParser::InvalidArgument, "can't specify data path when adding multiple layers" if options[:path]
-      end
-      map.add *layers, create_options
-    end
-  end
-
-  def contours(archive, dem_path, options)
-    add archive, "contours", options.merge(path: Pathname(dem_path))
-  end
-
-  def spot_heights(archive, dem_path, options)
-    add archive, "spot-heights", options.merge(path: Pathname(dem_path))
-  end
-
-  def relief(archive, dem_path, options)
-    add archive, "relief", options.merge(path: Pathname(dem_path))
-  end
-
-  def grid(archive, options)
-    add archive, "grid", options
-  end
-
-  def declination(archive, options)
-    add archive, "declination", options
-  end
-
-  def controls(archive, gps_path, options)
-    add archive, "controls", options.merge(path: Pathname(gps_path))
-  end
-
-  def overlay(archive, gps_path, options)
-    raise OptionParser::InvalidArgument, gps_path unless gps_path =~ /\.(gpx|kml)$/i
-    add archive, gps_path, options.merge(path: Pathname(gps_path))
-  end
-
-  def delete(archive, *names, options)
-    map = Map.load archive
-    names.map do |name|
-      Layer.sanitise name
-    end.uniq.map do |name|
-      name[?*] ? %r[^#{name.gsub(?., '\.').gsub(?*, '.*')}$] : name
-    end.tap do |names|
-      map.delete *names
-    end
-  end
-
-  def render(archive, *formats, options)
-    overwrite = options.delete :overwrite
-    formats << "svg" if formats.empty?
-    formats.map do |format|
-      Pathname(Formats === format ? "#{archive.basename}.#{format}" : format)
-    end.uniq.each do |path|
-      format = path.extname.delete_prefix(?.)
-      raise "unrecognised format: #{path}" if format.empty?
-      raise "unrecognised format: #{format}" unless Formats === format
-      raise "file already exists: #{path}" if path.exist? && !overwrite
-      raise "non-existent directory: #{path.parent}" unless path.parent.directory?
-    end.tap do |paths|
-      Map.load(archive).render *paths, options
-    end
-  end
-
-  def layers(state: nil, indent: "")
-    layer_dirs.grep_v(Pathname.pwd).flat_map do |directory|
-      Array(state).inject(directory, &:/).glob("*")
-    end.sort.each do |path|
-      case
-      when path.directory?
-        next if path.glob("**/*.yml").none?
-        puts [indent, path.basename.sub_ext("")].join
-        layers state: [*state, path.basename], indent: "  " + indent
-      when path.sub_ext("").directory?
-      when path.extname == ".yml"
-        puts [indent, path.basename.sub_ext("")].join
-      end
-    end.tap do |paths|
-      log_warn "no layers installed" if paths.none?
-    end
-  end
-
-  def config(layer = nil, **options)
-    chrome, firefox, path, resolution, layer_dir, labelling, delete = options.values_at :chrome, :firefox, :path, :resolution, :"layer-dir", :labelling, :delete
-    raise "not a directory: %s" % layer_dir if layer_dir && !layer_dir.directory?
-    raise "chrome path is not an executable" if chrome && !chrome.executable?
-    raise "firefox path is not an executable" if firefox && !firefox.executable?
-    Config.store("chrome", chrome.to_s) if chrome
-    Config.store("firefox", firefox.to_s) if firefox
-    Config.store("labelling", labelling) unless labelling.nil?
-    Config.store("layer-dir", layer_dir.to_s) if layer_dir
-
-    layer = Layer.sanitise layer
-    case
-    when !layer
-      raise OptionParser::InvalidArgument, "no layer name specified for path" if path
-      raise OptionParser::InvalidArgument, "no layer name specified for resolution" if resolution
-    when path || resolution
-      Config.store(layer, "path", path.to_s) if path
-      Config.store(layer, "resolution", resolution) if resolution
-    end
-    Config.delete(*layer, delete) if delete
-
-    if options.empty?
-      puts Config.to_str.each_line.drop(1)
-      log_neutral "no configuration yet" if Config.empty?
-    else
-      Config.save
-      log_success "configuration updated"
-    end
-  end
-
-  def with_browser
-    browser_name, browser_path = Config.slice("chrome", "firefox").first
-    raise "please configure a path for google chrome" unless browser_name
-    yield browser_name, Pathname.new(browser_path)
-  rescue Errno::ENOENT
-    raise "invalid %s path: %s" % [browser_name, browser_path]
-  end
 end
 
 begin

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: nswtopo
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta1
+  version: '3.0'
 platform: ruby
 authors:
 - Matthew Hollingworth
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies: []
-description: 
-email: 
+description:
+email:
 executables:
 - nswtopo
 extensions: []
@@ -29,20 +29,29 @@ files:
 - docs/grid.md
 - docs/info.md
 - docs/init.md
+- docs/inspect.md
 - docs/layers.md
+- docs/move.md
 - docs/overlay.md
 - docs/relief.md
 - docs/render.md
+- docs/scrape.md
 - docs/spot-heights.md
 - lib/nswtopo.rb
 - lib/nswtopo/archive.rb
 - lib/nswtopo/avl_tree.rb
+- lib/nswtopo/chrome.rb
+- lib/nswtopo/commands.rb
+- lib/nswtopo/commands/add.rb
+- lib/nswtopo/commands/config.rb
+- lib/nswtopo/commands/inspect.rb
+- lib/nswtopo/commands/layers.rb
+- lib/nswtopo/commands/scrape.rb
 - lib/nswtopo/config.rb
 - lib/nswtopo/dither.rb
 - lib/nswtopo/font.rb
-- lib/nswtopo/font/chrome.rb
-- lib/nswtopo/font/generic.rb
 - lib/nswtopo/formats.rb
+- lib/nswtopo/formats/gemf.rb
 - lib/nswtopo/formats/kmz.rb
 - lib/nswtopo/formats/mbtiles.rb
 - lib/nswtopo/formats/pdf.rb
@@ -63,8 +72,14 @@ files:
 - lib/nswtopo/geometry/vector.rb
 - lib/nswtopo/geometry/vector_sequence.rb
 - lib/nswtopo/gis.rb
-- lib/nswtopo/gis/arcgis_server.rb
-- lib/nswtopo/gis/arcgis_server/connection.rb
+- lib/nswtopo/gis/arcgis.rb
+- lib/nswtopo/gis/arcgis/connection.rb
+- lib/nswtopo/gis/arcgis/layer.rb
+- lib/nswtopo/gis/arcgis/layer/map.rb
+- lib/nswtopo/gis/arcgis/layer/query.rb
+- lib/nswtopo/gis/arcgis/layer/renderer.rb
+- lib/nswtopo/gis/arcgis/layer/statistics.rb
+- lib/nswtopo/gis/arcgis/service.rb
 - lib/nswtopo/gis/dem.rb
 - lib/nswtopo/gis/esri_hdr.rb
 - lib/nswtopo/gis/gdal_glob.rb
@@ -72,7 +87,6 @@ files:
 - lib/nswtopo/gis/geojson/collection.rb
 - lib/nswtopo/gis/geojson/line_string.rb
 - lib/nswtopo/gis/geojson/multi_line_string.rb
-- lib/nswtopo/gis/geojson/multi_point.rb
 - lib/nswtopo/gis/geojson/multi_polygon.rb
 - lib/nswtopo/gis/geojson/point.rb
 - lib/nswtopo/gis/geojson/polygon.rb
@@ -81,7 +95,6 @@ files:
 - lib/nswtopo/gis/gps/kml.rb
 - lib/nswtopo/gis/projection.rb
 - lib/nswtopo/gis/shapefile.rb
-- lib/nswtopo/gis/world_file.rb
 - lib/nswtopo/help_formatter.rb
 - lib/nswtopo/helpers.rb
 - lib/nswtopo/helpers/array.rb
@@ -92,6 +105,7 @@ files:
 - lib/nswtopo/helpers/tar_writer.rb
 - lib/nswtopo/layer.rb
 - lib/nswtopo/layer/arcgis_raster.rb
+- lib/nswtopo/layer/colour_mask.rb
 - lib/nswtopo/layer/contour.rb
 - lib/nswtopo/layer/control.rb
 - lib/nswtopo/layer/declination.rb
@@ -99,24 +113,31 @@ files:
 - lib/nswtopo/layer/grid.rb
 - lib/nswtopo/layer/import.rb
 - lib/nswtopo/layer/labels.rb
-- lib/nswtopo/layer/labels/fence.rb
+- lib/nswtopo/layer/labels/barrier.rb
+- lib/nswtopo/layer/mask_render.rb
 - lib/nswtopo/layer/overlay.rb
 - lib/nswtopo/layer/raster.rb
+- lib/nswtopo/layer/raster_import.rb
+- lib/nswtopo/layer/raster_render.rb
 - lib/nswtopo/layer/relief.rb
 - lib/nswtopo/layer/spot.rb
 - lib/nswtopo/layer/vector.rb
+- lib/nswtopo/layer/vector/cutout.rb
+- lib/nswtopo/layer/vector/knockout.rb
 - lib/nswtopo/layer/vegetation.rb
 - lib/nswtopo/log.rb
 - lib/nswtopo/map.rb
 - lib/nswtopo/os.rb
 - lib/nswtopo/safely.rb
+- lib/nswtopo/tiled_web_map.rb
+- lib/nswtopo/tree_indenter.rb
 - lib/nswtopo/version.rb
 - lib/nswtopo/zip.rb
 homepage: https://github.com/mholling/nswtopo
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,19 +145,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
-- GDAL >= v2.3
-- ImageMagick
-- Google Chrome
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+- GDAL >= v3.4
+- Google Chrome >= v112
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: A vector topographic mapping tool
 test_files: []

data/lib/nswtopo/font/chrome.rb

@@ -1,59 +0,0 @@
-module NSWTopo
-  module Font
-    module Chrome
-      ATTRIBUTES = %w[font-family font-variant font-style font-weight font-size letter-spacing word-spacing]
-
-      def command(string)
-        @input.puts string
-        lines, match = @output.expect(/(\{.*)\n/, 1)
-        response = JSON.parse match
-        raise "unexpected chrome error: %s" % response.dig("exceptionDetails", "exception", "description") if response["exceptionDetails"]
-        response.fetch("result").dig("value")
-      rescue TypeError, JSON::ParserError, KeyError
-        raise "unexpected chrome error"
-      end
-
-      def start_chrome
-        chrome_path = Config["chrome"]
-        svg = <<~XML
-          <?xml version='1.0' encoding='UTF-8'?>
-          <svg version='1.1' baseProfile='full' xmlns='http://www.w3.org/2000/svg' width='1mm' height='1mm' viewBox='0 0 1 1'>
-            <rect id='mm' width='1' height='1' stroke='none' />
-            <text id='text' />
-          </svg>
-        XML
-        @output, @input, @pid = PTY.spawn chrome_path, "--headless", "--disable-gpu", "--repl", "data:image/svg+xml;base64,#{Base64.encode64 svg}"
-        ObjectSpace.define_finalizer self, Proc.new { @input.puts "quit" }
-        command %Q[text = document.getElementById("text")]
-        @mm = command %Q[document.getElementById("mm").getBoundingClientRect().width]
-      end
-
-      def self.extended(instance)
-        instance.start_chrome
-      end
-
-      def validate(family)
-        return unless family
-        @families ||= Set[]
-        @families.add?(family) || return
-        command %Q[text.textContent="abcdefghijklmnopqrstuvwxyz"]
-        ["font-family:#{family}", nil].map do |style|
-          command %Q[text.setAttribute("style", "#{style}")]
-          command %Q[text.getBoundingClientRect().width]
-        end.inject(&:==) || return
-        log_neutral "font '#{family}' doesn't appear to be available"
-      end
-
-      def glyph_length(string, attributes)
-        style = attributes.slice(*ATTRIBUTES).map do |pair|
-          pair.join ?:
-        end.join(?;)
-        style << ";white-space:pre" if ?\s == string
-        validate attributes["font-family"]
-        command %Q[text.setAttribute("style", #{style.inspect})]
-        command %Q[text.textContent=#{string.inspect}]
-        command(%Q[text.getBoundingClientRect().width]) / @mm
-      end
-    end
-  end
-end

data/lib/nswtopo/font/generic.rb

@@ -1,25 +0,0 @@
-module NSWTopo
-  module Font
-    module Generic
-      WIDTHS = {
-        ?A => 0.732, ?B => 0.678, ?C => 0.682, ?D => 0.740, ?E => 0.583, ?F => 0.558, ?G => 0.728, ?H => 0.761, ?I => 0.256, ?J => 0.331, ?K => 0.641, ?L => 0.542, ?M => 0.843,
-        ?N => 0.740, ?O => 0.769, ?P => 0.649, ?Q => 0.769, ?R => 0.690, ?S => 0.620, ?T => 0.599, ?U => 0.728, ?V => 0.695, ?W => 1.108, ?X => 0.649, ?Y => 0.637, ?Z => 0.591,
-        ?a => 0.595, ?b => 0.595, ?c => 0.492, ?d => 0.595, ?e => 0.542, ?f => 0.335, ?g => 0.599, ?h => 0.583, ?i => 0.236, ?j => 0.289, ?k => 0.521, ?l => 0.236, ?m => 0.876,
-        ?n => 0.583, ?o => 0.571, ?p => 0.595, ?q => 0.595, ?r => 0.360, ?s => 0.492, ?t => 0.347, ?u => 0.575, ?v => 0.529, ?w => 0.864, ?x => 0.533, ?y => 0.529, ?z => 0.513,
-        ?0 => 0.595, ?1 => 0.595, ?2 => 0.595, ?3 => 0.595, ?4 => 0.595, ?5 => 0.595, ?6 => 0.595, ?7 => 0.595, ?8 => 0.595, ?9 => 0.595, ?! => 0.227, ?" => 0.422, ?# => 0.604,
-        ?$ => 0.595, ?% => 0.934, ?& => 0.678, ?' => 0.219, ?( => 0.314, ?) => 0.314, ?* => 0.451, ?+ => 0.595, ?, => 0.227, ?- => 0.426, ?. => 0.227, ?/ => 0.331, ?\\ => 0.327,
-        ?[ => 0.314, ?] => 0.314, ?^ => 0.595, ?_ => 0.500, ?` => 0.310, ?: => 0.227, ?; => 0.227, ?< => 0.595, ?= => 0.595, ?> => 0.595, ?? => 0.442, ?@ => 0.930, ?\s => 0.265,
-      }
-      WIDTHS.default = WIDTHS[?M]
-
-      def glyph_length(string, attributes)
-        font_size, letter_spacing, word_spacing = attributes.values_at("font-size", "letter-spacing", "word-spacing").map(&:to_f)
-        string.chars.each_cons(2).inject(WIDTHS[string[0]] * font_size) do |sum, pair|
-          next sum + WIDTHS[pair[1]] * font_size + letter_spacing                unless pair[0] == ?\s
-          next sum + WIDTHS[pair[1]] * font_size + letter_spacing + word_spacing unless pair[1] == ?\s
-          sum
-        end
-      end
-    end
-  end
-end

data/lib/nswtopo/gis/arcgis_server/connection.rb

@@ -1,52 +0,0 @@
-module NSWTopo
-  module ArcGISServer
-    class Connection
-      def initialize(http, service_path)
-        @http, @service_path, @headers = http, service_path, { "User-Agent" => "Ruby/#{RUBY_VERSION}", "Referer" => "%s://%s" % [http.use_ssl? ? "https" : "http", http.address] }
-        http.max_retries = 0
-      end
-
-      def repeatedly_request(request)
-        intervals ||= 5.times.map(&1.4142.method(:**))
-        response = @http.request(request)
-        response.error! unless Net::HTTPSuccess === response
-        yield response
-      rescue *ERRORS, Error => error
-        interval = intervals.shift
-        interval ? sleep(interval) : raise(error)
-        retry
-      end
-
-      def get(relative_path, **query, &block)
-        path = Pathname(@service_path).join(relative_path).to_s
-        path << ?? << URI.encode_www_form(query) unless query.empty?
-        request = Net::HTTP::Get.new(path, @headers)
-        repeatedly_request(request, &block)
-      end
-
-      def post(relative_path, **query, &block)
-        path = Pathname(@service_path).join(relative_path).to_s
-        request = Net::HTTP::Post.new(path, @headers)
-        request.body = URI.encode_www_form(query)
-        repeatedly_request(request, &block)
-      end
-
-      def process_json(response)
-        JSON.parse(response.body).tap do |result|
-          # raise Error, result["error"].values_at("message", "details").compact.join(?\n) if result["error"]
-          raise Error, result["error"]["message"] if result["error"]
-        end
-      rescue JSON::ParserError
-        raise Error, "unexpected ArcGIS response format"
-      end
-
-      def get_json(relative_path = "", **query)
-        get relative_path, query.merge(f: "json"), &method(:process_json)
-      end
-
-      def post_json(relative_path = "", **query)
-        post relative_path, query.merge(f: "json"), &method(:process_json)
-      end
-    end
-  end
-end

data/lib/nswtopo/gis/arcgis_server.rb

@@ -1,155 +0,0 @@
-require_relative 'arcgis_server/connection'
-
-module NSWTopo
-  module ArcGISServer
-    Error = Class.new RuntimeError
-    ERRORS = [Timeout::Error, Errno::ENETUNREACH, Errno::ETIMEDOUT, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, SocketError]
-    SERVICE = /^(?:MapServer|FeatureServer|ImageServer)$/
-
-    def self.check_uri(url)
-      uri = URI.parse url
-      return unless URI::HTTP === uri
-      instance, (id, *) = uri.path.split(?/).slice_after(SERVICE).take(2)
-      return unless instance.last =~ SERVICE
-      return unless !id || id =~ /^\d+$/
-      return uri, instance.join(?/), id
-    rescue URI::Error
-    end
-
-    def self.===(string)
-      uri, service_path, id = check_uri string
-      uri != nil
-    end
-
-    def self.start(url, &block)
-      uri, service_path, id = check_uri url
-      raise "invalid ArcGIS server URL: %s" % url unless uri
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https", read_timeout: 600) do |http|
-        connection = Connection.new http, service_path
-        service = connection.get_json
-        projection = case
-        when wkt  = service.dig("spatialReference", "wkt") then Projection.new(wkt)
-        when wkid = service.dig("spatialReference", "latestWkid") then Projection.new("EPSG:#{wkid}")
-        when wkid = service.dig("spatialReference", "wkid") then Projection.new("EPSG:#{wkid == 102100 ? 3857 : wkid}")
-        else raise Error, "no spatial reference found: #{uri}"
-        end
-        yield connection, service, projection, *id
-      end
-    rescue *ERRORS => error
-      raise Error, error.message
-    end
-
-    def arcgis_layer(url, where: nil, layer: nil, per_page: nil, margin: {})
-      ArcGISServer.start url do |connection, service, projection, id|
-        id = service["layers"].find do |info|
-          layer.to_s == info["name"]
-        end&.dig("id") if layer
-        id ? nil : layer ? raise("no such ArcGIS layer: %s" % layer) : raise("not an ArcGIS layer url: %s" % url)
-
-        layer = connection.get_json id.to_s
-        query_path = "#{id}/query"
-        max_record_count, fields, types, type_id_field, geometry_type, capabilities = layer.values_at "maxRecordCount", "fields", "types", "typeIdField", "geometryType", "capabilities"
-        raise Error, "no query capability available: #{url}" unless capabilities =~ /Query|Data/
-
-        if type_id_field && types
-          type_id_field = fields.find do |field|
-            field.values_at("alias", "name").include? type_id_field
-          end&.fetch("name")
-          type_values = types.map do |type|
-            type.values_at "id", "name"
-          end.to_h
-          subtype_coded_values = types.map do |type|
-            type.values_at "id", "domains"
-          end.map do |id, domains|
-            coded_values = domains.map do |name, domain|
-              [name, domain["codedValues"]]
-            end.select(&:last).map do |name, pairs|
-              values = pairs.map do |pair|
-                pair.values_at "code", "name"
-              end.to_h
-              [name, values]
-            end.to_h
-            [id, coded_values]
-          end.to_h
-        end
-
-        coded_values = fields.map do |field|
-          [field["name"], field.dig("domain", "codedValues")]
-        end.select(&:last).map do |name, pairs|
-          values = pairs.map do |pair|
-            pair.values_at "code", "name"
-          end.to_h
-          [name, values]
-        end.to_h
-
-        geometry = { rings: @map.bounding_box(margin).reproject_to(projection).coordinates.map(&:reverse) }.to_json
-        where = Array(where).map { |clause| "(#{clause})"}.join " AND "
-        query = { geometry: geometry, geometryType: "esriGeometryPolygon", returnIdsOnly: true, where: where }
-
-        object_ids = connection.get_json(query_path, query)["objectIds"]
-        next GeoJSON::Collection.new projection unless object_ids
-
-        features = Enumerator.new do |yielder|
-          per_page, total = [*per_page, *max_record_count, 500].min, object_ids.length
-          while object_ids.any?
-            yield total - object_ids.length, total if block_given? && total > 0
-            yielder << begin
-              connection.get_json query_path, outFields: ?*, objectIds: object_ids.take(per_page).join(?,)
-            rescue Error => error
-              (per_page /= 2) > 0 ? retry : raise(error)
-            end
-            object_ids.shift per_page
-          end
-        end.inject [] do |features, page|
-          features += page["features"]
-        end.map do |feature|
-          next unless geometry = feature["geometry"]
-          attributes = feature.fetch "attributes", {}
-
-          values = attributes.map do |name, value|
-            case
-            when type_id_field == name
-              type_values[value]
-            when decode = subtype_coded_values&.dig(attributes[type_id_field], name)
-              decode[value]
-            when decode = coded_values.dig(name)
-              decode[value]
-            when %w[null Null NULL <null> <Null> <NULL>].include?(value)
-              nil
-            else value
-            end
-          end
-          attributes = attributes.keys.zip(values).to_h
-
-          case geometry_type
-          when "esriGeometryPoint"
-            point = geometry.values_at "x", "y"
-            next unless point.all?
-            next GeoJSON::Point.new point, attributes
-          when "esriGeometryMultipoint"
-            points = geometry["points"]
-            next unless points&.any?
-            next GeoJSON::MultiPoint.new points.transpose.take(2).transpose, attributes
-          when "esriGeometryPolyline"
-            raise Error, "ArcGIS curve geometries not supported" if geometry.key? "curvePaths"
-            paths = geometry["paths"]
-            next unless paths&.any?
-            next GeoJSON::LineString.new paths[0], attributes if paths.one?
-            next GeoJSON::MultiLineString.new paths, attributes
-          when "esriGeometryPolygon"
-            raise Error, "ArcGIS curve geometries not supported" if geometry.key? "curveRings"
-            rings = geometry["rings"]
-            next unless rings&.any?
-            rings.each(&:reverse!) unless rings[0].anticlockwise?
-            next GeoJSON::Polygon.new rings, attributes if rings.one?
-            next GeoJSON::MultiPolygon.new rings.slice_before(&:anticlockwise?).to_a, attributes
-          else
-            raise Error, "unsupported ArcGIS geometry type: #{geometry_type}"
-          end
-        end.compact
-
-        GeoJSON::Collection.new projection, features
-      end
-    end
-  end
-end