From 03780e0381e0614cc3896b64c370f5e6be2fcfa1 Mon Sep 17 00:00:00 2001
From: Tom Johnson <tomjohnson@ucsb.edu>
Date: Wed, 23 Jan 2019 15:23:43 -0800
Subject: [PATCH] Remove references to `LatLonType` from Solr schema

This type is deprecated in Solr. Its removal from the template here shouldn't
affect existing adopters who may be using it. It will be removed only for folks
running the generator after this commit.

Fixes #1370
---
 .../config/solr/templates/solr/config/schema.xml    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/generators/active_fedora/config/solr/templates/solr/config/schema.xml b/lib/generators/active_fedora/config/solr/templates/solr/config/schema.xml
index 0a4de7106..f5895a052 100644
--- a/lib/generators/active_fedora/config/solr/templates/solr/config/schema.xml
+++ b/lib/generators/active_fedora/config/solr/templates/solr/config/schema.xml
@@ -99,10 +99,7 @@
      -->
     <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
 
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
-
-    <!-- An alternative geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
+    <!-- A geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
       For more information about this and other Spatial fields new to Solr 4, see:
       http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     -->
@@ -325,14 +322,6 @@
     <!-- Type used to index the lat and lon components for the "location" FieldType -->
     <dynamicField name="*_coordinate" type="tdouble" indexed="true"  stored="false" />
 
-    <!-- location (_ll...) -->
-    <dynamicField name="*_lli" type="location" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_llim" type="location" stored="false" indexed="true" multiValued="true"/>
-    <dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>
-
     <dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />
 
     <!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->