Gazetteer model

app/controllers/gazetteers_controller.rb

@@ -0,0 +1,143 @@
+class GazetteersController < ApplicationController
+  include DataControllerConfiguration::ProjectDataControllerConfiguration
+  before_action :set_gazetteer, only: %i[ show edit update destroy ]
+
+  # GET /gazetteers
+  # GET /gazetteers.json
+  def index
+    respond_to do |format|
+      format.html do
+        @recent_objects = Gazetteer.recent_from_project_id(sessions_current_project_id).order(updated_at: :desc).limit(10)
+        render '/shared/data/all/index'
+      end
+      format.json do
+        # TODO gzs, not gas
+        @geographic_areas = ::Queries::GeographicArea::Filter.new(params).all
+          .includes(:geographic_items)
+          .page(params[:page])
+          .per(params[:per])
+          # .order('geographic_items.cached_total_area, geographic_area.name')
+      end
+    end
+  end
+
+  # GET /gazetteers/1 or /gazetteers/1.json
+  def show
+  end
+
+  # GET /gazetteers/new
+  def new
+    respond_to do |format|
+      format.html { redirect_to new_gazetteer_task_path }
+    end
+  end
+
+  # GET /gazetteers/1/edit
+  def edit
+    respond_to do |format|
+      format.html { redirect_to new_gazetteer_task_path gazetteer_id: @gazetteer.id }
+    end
+  end
+
+  # GET /gazetteers/list
+  def list
+    @gazetteers = Gazetteer
+      .with_project_id(sessions_current_project_id)
+      .page(params[:page]).per(params[[:per]])
+  end
+
+  # POST /gazetteers.json
+  def create
+    @gazetteer = Gazetteer.new(gazetteer_params)
+
+    begin
+      rgeo_shape = Gazetteer.combine_shapes_to_rgeo(shape_params['shapes'])
+    # TODO make sure these errors work
+    rescue RGeo::Error::RGeoError => e
+      @gazetteer.errors.add(:base, e)
+    rescue RGeo::Error::InvalidGeometry => e
+      @gazetteer.errors.add(:base, "Invalid geometry: #{e}")
+    rescue TaxonWorks::Error => e
+      @gazetteer.errors.add(:base, e)
+    end
+
+    if @gazetteer.errors.include?(:base) || rgeo_shape.nil?
+      render json: @gazetteer.errors, status: :unprocessable_entity
+      return
+    end
+
+    @gazetteer.build_geographic_item(
+      type: 'GeographicItem::Geography',
+      geography: rgeo_shape
+    )
+
+    if @gazetteer.save
+      render :show, status: :created, location: @gazetteer
+    else
+      render json: @gazetteer.errors, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT /gazetteers/1
+  # PATCH/PUT /gazetteers/1.json
+  def update
+    respond_to do |format|
+      if @gazetteer.update(gazetteer_params)
+        format.html { redirect_to gazetteer_url(@gazetteer) }
+        format.json { render :show, status: :ok }
+      else
+        format.html { render :edit, status: :unprocessable_entity }
+        format.json { render json: @gazetteer.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /gazetteers/1
+  # DELETE /gazetteers/1.json
+  def destroy
+    # TODO Handle children/parents (if used)
+    @gazetteer.destroy!
+
+    respond_to do |format|
+      format.html {
+        redirect_to gazetteers_url,
+          # TODO this doesn't work
+          notice: 'Gazetteer was successfully destroyed.'
+      }
+      format.json { head :no_content }
+    end
+  end
+
+  def autocomplete
+    @gazetteers = ::Queries::Gazetteer::Autocomplete.new(
+      params.require(:term),
+      project_id: sessions_current_project_id,
+    ).autocomplete
+  end
+
+  def search
+    if params[:id].blank?
+      redirect_to(gazetteer_path,
+                  alert: 'You must select an item from the list with a click or tab press before clicking show.')
+    else
+      redirect_to gazetteer_path(params[:id])
+    end
+  end
+
+  private
+
+  def set_gazetteer
+    @gazetteer = Gazetteer.find(params[:id])
+  end
+
+  def gazetteer_params
+    params.require(:gazetteer).permit(:name, :parent_id,
+      :iso_3166_a2, :iso_3166_a3)
+    end
+
+  def shape_params
+    params.require(:gazetteer).permit(shapes: { geojson: [], wkt: []})
+  end
+
+
+end

app/controllers/tasks/gazetteers/new_gazetteer_controller.rb

@@ -0,0 +1,4 @@
+class Tasks::Gazetteers::NewGazetteerController < ApplicationController
+  include TaskControllerConfiguration
+
+end

app/controllers/tasks/gis/match_georeference_controller.rb

@@ -70,7 +70,7 @@ def drawn_collecting_events
       when 'polygon'
         @collecting_events = CollectingEvent.with_project_id(sessions_current_project_id)
           .joins(:geographic_items)
-          .where(GeographicItem.contained_by_wkt_sql(geometry))
+          .where(GeographicItem.covered_by_wkt_sql(geometry))
       else
       end
     end
@@ -143,7 +143,7 @@ def drawn_georeferences
       when 'polygon'
         @georeferences = Georeference.with_project_id(sessions_current_project_id)
           .joins(:geographic_item)
-          .where(GeographicItem.contained_by_wkt_sql(geometry))
+          .where(GeographicItem.covered_by_wkt_sql(geometry))
       else
       end
       if @georeferences.blank?

app/helpers/collecting_events_helper.rb

@@ -249,8 +249,7 @@ def collecting_event_to_simple_json_feature(collecting_event)
 
     if collecting_event.geographic_items.any?
       geo_item_id = collecting_event.geographic_items.select(:id).first.id
-      query = "ST_AsGeoJSON(#{GeographicItem::GEOMETRY_SQL.to_sql}::geometry) geo_json"
-      base['geometry'] = JSON.parse(GeographicItem.select(query).find(geo_item_id).geo_json)
+      base['geometry'] = GeographicItem.find(geo_item_id).to_geo_json
     end
     base
   end

app/helpers/gazetteers_helper.rb

@@ -0,0 +1,33 @@
+module GazetteersHelper
+  def gazetteer_tag(gazetteer)
+    return nil if gazetteer.nil?
+    gazetteer.name
+  end
+
+  def label_for_gazetteer(gazetteer)
+    return nil if gazetteer.nil?
+    gazetteer.name
+  end
+
+  def gazetteer_link(gazetteer, link_text = nil)
+    return nil if gazetteer.nil?
+    link_text ||= gazetteer.name
+    link_to(link_text, gazetteer)
+  end
+
+  def gazetteer_link_list(gazetteers)
+    content_tag(:ul) do
+      gazetteers.collect { |a| content_tag(:li, gazetteer_link(a)) }.join.html_safe
+    end
+  end
+
+  def gazetteer_autocomplete_tag(gazetteer)
+    gazetteer_tag(gazetteer)
+  end
+
+  def gazetteers_search_form
+    render('/gazetteers/quick_search_form')
+  end
+
+
+end

app/javascript/packs/application.js

@@ -107,5 +107,5 @@ import '../vue/tasks/otus/new_otu/main.js'
 import '../vue/tasks/leads/hub/main.js'
 import '../vue/tasks/data_attributes/field_synchronize/main.js'
 import '../vue/tasks/observation_matrices/import_nexus/main.js'
-
-import '../vue/tasks/dwc_occurrences/filter/main.js'
+import '../vue/tasks/dwc_occurrences/filter/main.js'
+import '../vue/tasks/gazetteers/new_gazetteer/main.js'

app/javascript/vue/components/georeferences/map.vue

@@ -35,6 +35,21 @@ let geographicArea
 
 const TILE_MAP_STORAGE_KEY = 'tw::map::tile'
 
+const DRAW_CONTROLS_PROPS = [
+  'drawCircle',
+  'drawCircleMarker',
+  'drawMarker',
+  'drawPolyline',
+  'drawPolygon',
+  'drawRectangle',
+  'drawText',
+  'editMode',
+  'dragMode',
+  'cutPolygon',
+  'removalMode',
+  'rotateMode'
+]
+
 const props = defineProps({
   zoomAnimate: {
     type: Boolean,
@@ -198,6 +213,13 @@ watch(
   }
 )
 
+watch(
+  () => props.drawControls,
+  (newVal) => {
+    mapObject.pm.addControls(getControls(newVal))
+  }
+)
+
 onMounted(() => {
   mapObject = L.map(leafletMap.value, {
     center: props.center,
@@ -245,6 +267,15 @@ onUnmounted(() => {
   observeMap?.disconnect()
 })
 
+function getControls(show) {
+  let controls = { position: 'topleft' }
+  DRAW_CONTROLS_PROPS.forEach((prop) => {
+    controls[prop] = show ? props[prop] : false
+  })
+
+  return controls
+}
+
 const addDrawControllers = () => {
   getDefaultTile().addTo(mapObject)
   if (props.tilesSelection) {
@@ -254,21 +285,7 @@ const addDrawControllers = () => {
   }
 
   if (props.drawControls) {
-    mapObject.pm.addControls({
-      position: 'topleft',
-      drawCircle: props.drawCircle,
-      drawCircleMarker: props.drawCircleMarker,
-      drawMarker: props.drawMarker,
-      drawPolyline: props.drawPolyline,
-      drawPolygon: props.drawPolygon,
-      drawRectangle: props.drawRectangle,
-      drawText: props.drawText,
-      editMode: props.editMode,
-      dragMode: props.dragMode,
-      cutPolygon: props.cutPolygon,
-      removalMode: props.removalMode,
-      rotateMode: props.rotateMode
-    })
+    mapObject.pm.addControls(getControls(true))
   }
 
   if (!props.actions) {
@@ -277,6 +294,7 @@ const addDrawControllers = () => {
     })
   }
 }
+
 const handleEvents = () => {
   mapObject.on('baselayerchange', (e) => {
     localStorage.setItem(TILE_MAP_STORAGE_KEY, e.name)

app/javascript/vue/constants/gazetteerTypes.js

@@ -0,0 +1,4 @@
+//export const GEOREFERENCE_GEOLOCATE = 'Georeference::GeoLocate'
+export const GZ_LEAFLET = 'Leaflet'
+export const GZ_POINT = 'Point'
+export const GZ_WKT = 'WKT'

app/javascript/vue/constants/index.js

@@ -4,6 +4,7 @@ export * from './dataAttributes'
 export * from './descriptorTypes'
 export * from './downloadTypes'
 export * from './events'
+export * from './gazetteerTypes'
 export * from './georeferenceTypes'
 export * from './identifierTypes'
 export * from './importDataset'

app/javascript/vue/routes/endpoints/Gazetteer.js

@@ -0,0 +1,17 @@
+import baseCRUD from './base'
+import AjaxCall from '@/helpers/ajaxCall.js'
+
+const controller = 'gazetteers'
+const permitParams = {
+  gazetteer: {
+    name: String,
+    shapes: {
+      geojson: [],
+      wkt: []
+    }
+  }
+}
+
+export const Gazetteer = {
+  ...baseCRUD(controller, permitParams)
+}

app/javascript/vue/routes/endpoints/index.js

@@ -26,6 +26,7 @@ export { Documentation } from './Documentation'
 export { Download } from './Download'
 export { DwcOcurrence } from './DwcOcurrence'
 export { Extract } from './Extract'
+export { Gazetteer } from './Gazetteer'
 export { GeographicArea } from './GeographicArea'
 export { Georeference } from './Georeference'
 export { Identifier } from './Identifier'

app/javascript/vue/routes/routes.js

@@ -53,6 +53,7 @@ const RouteNames = {
     '/tasks/biological_associations/biological_associations_graph',
   NewCollectingEvent: '/tasks/collecting_events/new_collecting_event',
   NewExtract: '/tasks/extracts/new_extract',
+  NewGazetteer: '/tasks/gazetteers/new_gazetteer',
   NewLead: '/tasks/leads/new_lead',
   NewNamespace: '/tasks/namespaces/new_namespace',
   NewObservationMatrix: '/tasks/observation_matrices/new_matrix',