Skip to content

Commit

Permalink
Merge pull request #3 from BTAA-Geospatial-Data-Project/feature/gbl-2.0
Browse files Browse the repository at this point in the history
GeoBlacklight 2.0
  • Loading branch information
mberkowski authored Mar 26, 2019
2 parents 1b60729 + 52dca49 commit cde4b0a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ $ cd /usr/local/solr && bin/solr restart
```

### Release Version
B1G Geoportal Version 1.8.12 / GeoBlacklight 1.8.0
B1G Geoportal Version 2.0.0 / GeoBlacklight 2.0.0
12 changes: 11 additions & 1 deletion conf/schema.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema name="geoblacklight-schema" version="1.6">
<schema name="geoblacklight-schema" version="2.0">
<uniqueKey>layer_slug_s</uniqueKey>
<fields>
<field name="_version_" type="long" stored="true" indexed="true"/>
Expand Down Expand Up @@ -65,6 +65,8 @@
<dynamicField name="*_pt" type="location" stored="true" indexed="true"/>
<dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/><!-- deprecated -->
<dynamicField name="*_geom" type="location_rpt" stored="true" indexed="true"/>
<dynamicField name="*_bboxtype" type="bbox" stored="true" indexed="true"/>

</fields>

<types>
Expand Down Expand Up @@ -145,6 +147,11 @@

<fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers"/>
<!-- Adding field type for bboxField that enables, among other things, overlap ratio calculations -->
<fieldType name="bbox" class="solr.BBoxField"
geo="true" distanceUnits="kilometers" numberType="pdouble" />
<fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>


</types>

Expand Down Expand Up @@ -188,4 +195,7 @@
<copyField source="dct_provenance_s" dest="suggest"/>
<copyField source="dc_subject_sm" dest="suggest"/>
<copyField source="dct_spatial_sm" dest="suggest"/>

<!-- for bbox value -->
<copyField source="solr_geom" dest="solr_bboxtype"/>
</schema>
2 changes: 1 addition & 1 deletion conf/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
<str name="name">mySuggester</str>
<str name="lookupImpl">FuzzyLookupFactory</str>
<str name="suggestAnalyzerFieldType">textSuggest</str>
<str name="buildOnCommit">false</str>
<str name="buildOnCommit">true</str>
<str name="field">suggest</str>
</lst>
</searchComponent>
Expand Down

0 comments on commit cde4b0a

Please sign in to comment.