diff --git a/.github/maven-badge.svg b/.github/maven-badge.svg index c6239260b64b..cff4a7ad53c4 100644 --- a/.github/maven-badge.svg +++ b/.github/maven-badge.svg @@ -21,6 +21,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD v4.0.1 v4.0.1 @@ -67,5 +68,9 @@ v4.0.4 v4.0.4 >>>>>>> b5eea5d60a (Set latest release version to 4.0.4) +======= + v4.0.4 + v4.0.4 +>>>>>>> locationtech-main diff --git a/CITATION.cff b/CITATION.cff index a3be9cdef955..f61d93a04499 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -66,6 +66,7 @@ authors: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD orcid: https://orcid.org/0000-0002-7227-9173 ======= @@ -171,6 +172,8 @@ authors: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main keywords: - PROJ - geodesy diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index abb96e468875..5411739b207e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,6 +13,7 @@ has the ability to contribute to PROJ. Here's a few suggestion on how: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -108,6 +109,8 @@ has the ability to contribute to PROJ. Here's a few suggestion on how: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main GeoMesa is an open source suite of tools that enables large-scale geospatial querying and analytics on distributed computing systems. GeoMesa provides spatio-temporal indexing on top of the Accumulo, HBase and Cassandra databases for massive storage of point, line, and polygon data. GeoMesa also provides near real time @@ -121,6 +124,7 @@ geospatial analytics. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> e771dc363 (typo fixes) @@ -219,6 +223,9 @@ geospatial analytics. ======= ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +======= +>>>>>>> locationtech-main * Help PROJ-users that is less experienced than yourself. * Write a bug report * Request a new feature @@ -231,6 +238,7 @@ geospatial analytics. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) ======= >>>>>>> e771dc363 (typo fixes) @@ -367,6 +375,9 @@ geospatial analytics. ======= >>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) +>>>>>>> locationtech-main In the following sections you can find some guidelines on how to contribute. As PROJ is managed on GitHub most contributions require that you have a GitHub diff --git a/README.md b/README.md index d0ecb8a7640e..9fe75427eefd 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -127,6 +128,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main

@@ -135,6 +138,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c59e00e4f (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD @@ -164,6 +168,9 @@ ======= >>>>>>> c59e00e4f (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> c59e00e4f (Merge pull request #3524 from cffk/merid-update-fix) +>>>>>>> locationtech-main <<<<<<< HEAD GeoMesa is an open source suite of tools that enables large-scale geospatial querying and analytics on distributed @@ -176,6 +183,7 @@ geospatial analytics. ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # PROJ ======= @@ -209,11 +217,23 @@ geospatial analytics. >>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +[![Travis Status](https://travis-ci.com/OSGeo/PROJ.svg?branch=master)](https://travis-ci.com/OSGeo/PROJ) +[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/OSGeo/PROJ?branch=master&svg=true)](https://ci.appveyor.com/project/OSGeo/PROJ?branch=master) +[![Docker build Status](https://img.shields.io/docker/cloud/build/osgeo/proj)](https://hub.docker.com/r/osgeo/proj/builds) +[![Coveralls Status](https://coveralls.io/repos/github/OSGeo/PROJ/badge.svg?branch=master)](https://coveralls.io/github/OSGeo/PROJ?branch=master) +[![Gitter](https://badges.gitter.im/OSGeo/proj.4.svg)](https://gitter.im/OSGeo/proj.4) +[![Mailing List](https://img.shields.io/badge/PROJ-mailing%20list-4eb899.svg)](http://lists.osgeo.org/mailman/listinfo/proj) +[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) +>>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) + +>>>>>>> locationtech-main <<<<<<< HEAD

<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5c88d70ae3 (Merge pull request #3524 from cffk/merid-update-fix) ======= # PROJ @@ -354,6 +374,23 @@ https://proj.org/ <<<<<<< HEAD >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +======= + +>>>>>>> c59e00e4f (Merge pull request #3524 from cffk/merid-update-fix) + +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5884394.svg)](https://doi.org/10.5281/zenodo.5884394) + +PROJ is a generic coordinate transformation software, that transforms +coordinates from one coordinate reference system (CRS) to another. +This includes cartographic projections as well as geodetic transformations. + +For more information on the PROJ project please see the web page at: + +https://proj.org/ + +<<<<<<< HEAD +>>>>>>> locationtech-main * [Main documentation](https://www.geomesa.org/documentation/) * [Upgrade Guide](https://www.geomesa.org/documentation/user/upgrade.html) * Quick Starts: @@ -367,6 +404,7 @@ https://proj.org/ ======= The PROJ mailing list can be found at: <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 73e3ca4b45 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD <<<<<<< HEAD @@ -384,6 +422,13 @@ The PROJ mailing list can be found at: https://lists.osgeo.org/mailman/listinfo/proj/ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> c59e00e4f (Merge pull request #3524 from cffk/merid-update-fix) + +https://lists.osgeo.org/mailman/listinfo/proj/ + +>>>>>>> locationtech-main +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -564,214 +609,277 @@ https://lists.osgeo.org/mailman/listinfo/proj/ >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') ======= >>>>>>> c59e00e4fb (Merge pull request #3524 from cffk/merid-update-fix) -**Current release: [3.5.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.5.0)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-hbase_2.12-3.5.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-accumulo_2.12-3.5.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-cassandra_2.12-3.5.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-kafka_2.12-3.5.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-redis_2.12-3.5.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-fs_2.12-3.5.0-bin.tar.gz) | ======= -======= ->>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) -**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** +**Current release: [4.0.4](https://github.com/locationtech/geomesa/releases/tag/geomesa-4.0.4)**      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) -<<<<<<< HEAD ->>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) -======= ->>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) -======= -======= ->>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) -======= ->>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) -======= ->>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) -======= ->>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.4/geomesa-hbase_2.12-4.0.4-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.4/geomesa-accumulo_2.12-4.0.4-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.4/geomesa-cassandra_2.12-4.0.4-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.4/geomesa-kafka_2.12-4.0.4-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.4/geomesa-redis_2.12-4.0.4-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.4/geomesa-fs_2.12-4.0.4-bin.tar.gz) | + [**PostGIS**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.4/geomesa-gt_2.12-4.0.4-bin.tar.gz) ======= ->>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') -**Current release: [3.4.1](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.1)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-hbase_2.12-3.4.1-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-accumulo_2.12-3.4.1-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-cassandra_2.12-3.4.1-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-kafka_2.12-3.4.1-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-redis_2.12-3.4.1-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-fs_2.12-3.4.1-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-bigtable_2.12-3.4.1-bin.tar.gz) -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> 6d17d625fd ([maven-release-plugin] prepare for next development iteration) ======= ->>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) -**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** +>>>>>>> 737fb2cb2c ([maven-release-plugin] prepare for next development iteration) ======= -**Current release: [3.5.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.5.0)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-hbase_2.12-3.5.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-accumulo_2.12-3.5.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-cassandra_2.12-3.5.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-kafka_2.12-3.5.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-redis_2.12-3.5.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-fs_2.12-3.5.0-bin.tar.gz) | ->>>>>>> 58d14a257e (GEOMESA-3254 Add Bloop build support) - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) -<<<<<<< HEAD ->>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 20da909f0e ([maven-release-plugin] prepare for next development iteration) ======= ->>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 417ad813eb ([maven-release-plugin] prepare for next development iteration) ======= ->>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) ======= -**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) ->>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> a801bb2986 ([maven-release-plugin] prepare for next development iteration) ======= -**Current release: [3.3.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.3.0)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-hbase_2.12-3.3.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-accumulo_2.12-3.3.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-cassandra_2.12-3.3.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-kafka_2.12-3.3.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-redis_2.12-3.3.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-fs_2.12-3.3.0-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-bigtable_2.12-3.3.0-bin.tar.gz) ->>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) -<<<<<<< HEAD ->>>>>>> f9c85b7d56 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ->>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD ->>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') +**Current release: [4.0.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-4.0.0)**      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) -<<<<<<< HEAD ->>>>>>> fb47f5073b ([maven-release-plugin] prepare for next development iteration) -======= ->>>>>>> 61d746ac26 ([maven-release-plugin] prepare for next development iteration) -======= -======= ->>>>>>> 8d2851846c ([maven-release-plugin] prepare for next development iteration) -======= ->>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) -======= ->>>>>>> f3dd0ac675 ([maven-release-plugin] prepare for next development iteration) + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.0/geomesa-hbase_2.12-4.0.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.0/geomesa-accumulo_2.12-4.0.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.0/geomesa-cassandra_2.12-4.0.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.0/geomesa-kafka_2.12-4.0.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.0/geomesa-redis_2.12-4.0.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.0/geomesa-fs_2.12-4.0.0-bin.tar.gz) | + [**PostGIS**](https://github.com/locationtech/geomesa/releases/download/geomesa-4.0.0/geomesa-gt_2.12-4.0.0-bin.tar.gz) ======= ->>>>>>> a0515b7519 ([maven-release-plugin] prepare for next development iteration) ======= ->>>>>>> 3be8d2a5a4 (Merge branch 'feature/postgis-fixes') -**Current release: [3.4.1](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.1)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-hbase_2.12-3.4.1-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-accumulo_2.12-3.4.1-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-cassandra_2.12-3.4.1-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-kafka_2.12-3.4.1-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-redis_2.12-3.4.1-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-fs_2.12-3.4.1-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-bigtable_2.12-3.4.1-bin.tar.gz) -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 0c5ed829b1 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) ======= ->>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) -**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) -<<<<<<< HEAD ->>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) ======= ->>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) ======= ->>>>>>> f3dd0ac675 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) ======= -**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) ->>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> a0c34ab601 ([maven-release-plugin] prepare for next development iteration) ======= -**Current release: [3.3.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.3.0)** - -      - [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-hbase_2.12-3.3.0-bin.tar.gz) | - [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-accumulo_2.12-3.3.0-bin.tar.gz) | - [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-cassandra_2.12-3.3.0-bin.tar.gz) | - [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-kafka_2.12-3.3.0-bin.tar.gz) | - [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-redis_2.12-3.3.0-bin.tar.gz) | - [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-fs_2.12-3.3.0-bin.tar.gz) | - [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-bigtable_2.12-3.3.0-bin.tar.gz) -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 5792d822c6 ([maven-release-plugin] prepare for next development iteration) -<<<<<<< HEAD ->>>>>>> 315436b799 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= ->>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) ->>>>>>> fb47f5073b ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD ->>>>>>> 848040ab2b ([maven-release-plugin] prepare for next development iteration) -======= -======= ->>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) ->>>>>>> 61d746ac26 ([maven-release-plugin] prepare for next development iteration) ->>>>>>> e91404e741 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +**Current release: [3.5.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.5.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-hbase_2.12-3.5.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-accumulo_2.12-3.5.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-cassandra_2.12-3.5.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-kafka_2.12-3.5.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-redis_2.12-3.5.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-fs_2.12-3.5.0-bin.tar.gz) | +======= +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** +<<<<<<< HEAD + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +<<<<<<< HEAD +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +**Current release: [3.4.1](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.1)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-hbase_2.12-3.4.1-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-accumulo_2.12-3.4.1-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-cassandra_2.12-3.4.1-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-kafka_2.12-3.4.1-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-redis_2.12-3.4.1-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-fs_2.12-3.4.1-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-bigtable_2.12-3.4.1-bin.tar.gz) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** +======= +**Current release: [3.5.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.5.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-hbase_2.12-3.5.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-accumulo_2.12-3.5.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-cassandra_2.12-3.5.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-kafka_2.12-3.5.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-redis_2.12-3.5.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-fs_2.12-3.5.0-bin.tar.gz) | +>>>>>>> 58d14a257e (GEOMESA-3254 Add Bloop build support) + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +<<<<<<< HEAD +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +**Current release: [3.3.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.3.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-hbase_2.12-3.3.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-accumulo_2.12-3.3.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-cassandra_2.12-3.3.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-kafka_2.12-3.3.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-redis_2.12-3.3.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-fs_2.12-3.3.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-bigtable_2.12-3.3.0-bin.tar.gz) +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +>>>>>>> f9c85b7d56 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD +>>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +<<<<<<< HEAD +>>>>>>> fb47f5073b ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 61d746ac26 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 8d2851846c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> f3dd0ac675 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b7519 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 3be8d2a5a4 (Merge branch 'feature/postgis-fixes') +**Current release: [3.4.1](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.1)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-hbase_2.12-3.4.1-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-accumulo_2.12-3.4.1-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-cassandra_2.12-3.4.1-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-kafka_2.12-3.4.1-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-redis_2.12-3.4.1-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-fs_2.12-3.4.1-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-bigtable_2.12-3.4.1-bin.tar.gz) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 0c5ed829b1 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +<<<<<<< HEAD +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> f3dd0ac675 ([maven-release-plugin] prepare for next development iteration) +======= +**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +**Current release: [3.3.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.3.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-hbase_2.12-3.3.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-accumulo_2.12-3.3.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-cassandra_2.12-3.3.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-kafka_2.12-3.3.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-redis_2.12-3.3.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-fs_2.12-3.3.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-bigtable_2.12-3.3.0-bin.tar.gz) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 5792d822c6 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +>>>>>>> 315436b799 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +>>>>>>> fb47f5073b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +>>>>>>> 848040ab2b ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 61d746ac26 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> e91404e741 ([maven-release-plugin] prepare for next development iteration)      [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.5.0/geomesa-hbase_2.12-3.5.0-bin.tar.gz) | @@ -4816,6 +4924,251 @@ automatically fetch resource files that are not present locally from the CDN. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +<<<<<<< HEAD +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +**Current release: [3.4.1](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.1)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-hbase_2.12-3.4.1-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-accumulo_2.12-3.4.1-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-cassandra_2.12-3.4.1-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-kafka_2.12-3.4.1-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-redis_2.12-3.4.1-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-fs_2.12-3.4.1-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.1/geomesa-bigtable_2.12-3.4.1-bin.tar.gz) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +<<<<<<< HEAD +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +**Current release: [3.4.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.4.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-hbase_2.12-3.4.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-accumulo_2.12-3.4.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-cassandra_2.12-3.4.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-kafka_2.12-3.4.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-redis_2.12-3.4.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-fs_2.12-3.4.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.4.0/geomesa-bigtable_2.12-3.4.0-bin.tar.gz) +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +**Current release: [3.3.0](https://github.com/locationtech/geomesa/releases/tag/geomesa-3.3.0)** + +      + [**HBase**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-hbase_2.12-3.3.0-bin.tar.gz) | + [**Accumulo**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-accumulo_2.12-3.3.0-bin.tar.gz) | + [**Cassandra**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-cassandra_2.12-3.3.0-bin.tar.gz) | + [**Kafka**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-kafka_2.12-3.3.0-bin.tar.gz) | + [**Redis**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-redis_2.12-3.3.0-bin.tar.gz) | + [**FileSystem**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-fs_2.12-3.3.0-bin.tar.gz) | + [**Bigtable**](https://github.com/locationtech/geomesa/releases/download/geomesa-3.3.0/geomesa-bigtable_2.12-3.3.0-bin.tar.gz) +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +>>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) +======= +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD +>>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD +>>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') +======= +======= +======= +See the NEWS file for changes between versions. +>>>>>>> 360db021b6 (Merge pull request #3524 from cffk/merid-update-fix) +>>>>>>> 153df87aaa (Merge pull request #3524 from cffk/merid-update-fix) + +The following command line utilities are included in the PROJ package: +>>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) + +- `proj`: for cartographic projection of geodetic coordinates. +- `cs2cs`: for transformation from one CRS to another CRS. +- `geod`: for geodesic (great circle) computations. +- `cct`: for generic Coordinate Conversions and Transformations. +- `gie`: the Geospatial Integrity Investigation Environment. +- `projinfo`: for geodetic object and coordinate operation queries. +- `projsync`: for synchronizing PROJ datum and transformation support data. + +> More information on the utilities can be found on the [PROJ website](https://proj.org/apps). + +## Installation + +Consult the [Installation](https://proj.org/install.html) page of the official +documentation. +For builds on the master branch, [install.rst](https://github.com/OSGeo/PROJ/blob/master/docs/source/install.rst) +might be more up-to-date. + +<<<<<<< HEAD +```bash +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +$ gpg2 --verify geomesa-accumulo_2.12-4.0.4-bin.tar.gz.asc geomesa-accumulo_2.12-4.0.4-bin.tar.gz +======= +======= +>>>>>>> 6d17d625fd ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 737fb2cb2c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 20da909f0e ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 417ad813eb ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a801bb2986 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD +$ gpg2 --verify geomesa-accumulo_2.12-4.0.0-bin.tar.gz.asc geomesa-accumulo_2.12-4.0.0-bin.tar.gz +======= +======= +>>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0c34ab601 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD +$ gpg2 --verify geomesa-accumulo_2.12-3.5.0-bin.tar.gz.asc geomesa-accumulo_2.12-3.5.0-bin.tar.gz +======= +$ gpg2 --verify geomesa-accumulo_2.12-3.4.0-bin.tar.gz.asc geomesa-accumulo_2.12-3.4.0-bin.tar.gz +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +$ gpg2 --verify geomesa-accumulo_2.12-3.4.0-bin.tar.gz.asc geomesa-accumulo_2.12-3.4.0-bin.tar.gz +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +$ gpg2 --verify geomesa-accumulo_2.12-3.4.1-bin.tar.gz.asc geomesa-accumulo_2.12-3.4.1-bin.tar.gz +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +======= +$ gpg2 --verify geomesa-accumulo_2.12-3.4.0-bin.tar.gz.asc geomesa-accumulo_2.12-3.4.0-bin.tar.gz +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +$ gpg2 --verify geomesa-accumulo_2.12-3.4.0-bin.tar.gz.asc geomesa-accumulo_2.12-3.4.0-bin.tar.gz +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +======= +$ gpg2 --verify geomesa-accumulo_2.12-3.4.1-bin.tar.gz.asc geomesa-accumulo_2.12-3.4.1-bin.tar.gz +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +$ gpg2 --verify geomesa-accumulo_2.12-3.4.0-bin.tar.gz.asc geomesa-accumulo_2.12-3.4.0-bin.tar.gz +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +======= +$ gpg2 --verify geomesa-accumulo_2.12-3.3.0-bin.tar.gz.asc geomesa-accumulo_2.12-3.3.0-bin.tar.gz +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +>>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) +======= +======= +======= +$ gpg2 --verify geomesa-accumulo_2.12-3.4.1-bin.tar.gz.asc geomesa-accumulo_2.12-3.4.1-bin.tar.gz +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') +>>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') +``` +======= +## Distribution files and format +>>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) + +Sources are distributed in one or more files. The principle elements +of the system are stored in a compressed tar file named `proj-x.y.z.tar.gz` where +"x" will indicate the major release number, "y" indicates the minor release +number, and "z" indicates the patch number of the release. + +In addition to the PROJ software package, distributions of datum +conversion grid files and PROJ parameter files are also available. +The grid package is distributed under the name `proj-data-x.y.zip`, +where "x" is the major release version and "y" is the minor release +version numbers. The resource packages can be downloaded from the +[PROJ website](https://proj.org/download.html). + +More info on the contents of the proj-data package can be +found at the +[PROJ-data GitHub repository](https://github.com/OSGeo/PROJ-data). + +The resource file packages should be extracted to `PROJ_LIB` +where PROJ will find them after installation. The default location of +`PROJ_LIB` on UNIX-based systems is `/usr/local/share/proj` but it may +be changed to a different directory. On Windows you have to define +`PROJ_LIB` yourself. + +As an alternative to installing the data package on the local system, +the resource files can be retrieved on-the-fly from the +[PROJ CDN](https://cdn.proj.org/). A [network-enabled](https://proj.org/usage/network.html) PROJ build, will +automatically fetch resource files that are not present locally from the +CDN. + +>>>>>>> locationtech-main <<<<<<< HEAD ```xml @@ -4834,6 +5187,7 @@ CDN. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD 3.5.1 ======= @@ -4979,6 +5333,8 @@ CDN. >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.4 ======= ======= @@ -5053,16 +5409,22 @@ CDN. <<<<<<< HEAD >>>>>>> 082c87bda9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8252893b4e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= 3.4.1 >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ``` ======= @@ -5130,6 +5492,7 @@ CDN. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6d7a215aea ([maven-release-plugin] prepare for next development iteration) ======= @@ -5155,18 +5518,26 @@ CDN. ======= >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -5175,6 +5546,7 @@ CDN. ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 370b3c0913 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -5207,6 +5579,10 @@ CDN. >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -5222,6 +5598,7 @@ CDN. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5237,6 +5614,11 @@ CDN. >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +======= +======= +>>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> a1258aa46 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -5246,6 +5628,7 @@ CDN. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -5258,6 +5641,11 @@ CDN. >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +>>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main +======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -5266,16 +5654,22 @@ CDN. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5284,6 +5678,9 @@ CDN. >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5292,34 +5689,47 @@ CDN. >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5378,6 +5788,10 @@ CDN. ======= >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +======= +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main Snapshot versions are published nightly to the Eclipse repository: ======= ```xml @@ -5440,6 +5854,7 @@ For nightly snapshot integration, add: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) @@ -5479,6 +5894,11 @@ For nightly snapshot integration, add: >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +======= +======= +>>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -5487,28 +5907,38 @@ For nightly snapshot integration, add: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5531,6 +5961,10 @@ For nightly snapshot integration, add: ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +======= +>>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main Snapshot versions are published nightly to the Eclipse repository: >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5547,6 +5981,7 @@ Snapshot versions are published nightly to the Eclipse repository: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 02e4b25510 ([maven-release-plugin] prepare for next development iteration) ======= @@ -5556,12 +5991,17 @@ Snapshot versions are published nightly to the Eclipse repository: ======= >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -5569,6 +6009,7 @@ Snapshot versions are published nightly to the Eclipse repository: >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -5584,6 +6025,8 @@ Snapshot versions are published nightly to the Eclipse repository: ======= >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= Snapshot versions are published nightly to the Eclipse repository: >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -5596,6 +6039,7 @@ Snapshot versions are published nightly to the Eclipse repository: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5609,6 +6053,11 @@ Snapshot versions are published nightly to the Eclipse repository: >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +======= +======= +>>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -5621,11 +6070,14 @@ Snapshot versions are published nightly to the Eclipse repository: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 531c6d9870 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -5633,9 +6085,12 @@ Snapshot versions are published nightly to the Eclipse repository: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -5644,20 +6099,29 @@ Snapshot versions are published nightly to the Eclipse repository: >>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 92609167dd ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5666,31 +6130,43 @@ Snapshot versions are published nightly to the Eclipse repository: >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e7ad661fa7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= ======= Snapshot versions are published nightly to the Eclipse repository: >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= ======= >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +<<<<<<< HEAD >>>>>>> 370b3c0913 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= ======= ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main Snapshot versions are published nightly to the Eclipse repository: >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -5698,20 +6174,30 @@ Snapshot versions are published nightly to the Eclipse repository: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) ======= ======= >>>>>>> 370b3c0913 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> locationtech-main +======= Snapshot versions are published nightly to the Eclipse repository: >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= Snapshot versions are published nightly to the Eclipse repository: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD ======= >>>>>>> 05410a7682 ([maven-release-plugin] prepare for next development iteration) ======= @@ -5785,6 +6271,8 @@ Snapshot versions are published nightly to the Eclipse repository: >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main ```xml @@ -5822,6 +6310,7 @@ DataStore implementations: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD 3.5.1 ======= @@ -5845,6 +6334,9 @@ DataStore implementations: <<<<<<< HEAD <<<<<<< HEAD 3.5.1 +======= + 4.0.4 +>>>>>>> locationtech-main ======= ======= >>>>>>> 9c77968e00 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -5863,10 +6355,13 @@ DataStore implementations: ======= >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main <<<<<<< HEAD +======= +>>>>>>> locationtech-main 4.0.0 ======= ======= @@ -5921,6 +6416,7 @@ DataStore implementations: >>>>>>> 7ae88ee16e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 082c87bda9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -5931,12 +6427,17 @@ DataStore implementations: ======= >>>>>>> locationtech-main ======= +>>>>>>> 082c87bda9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main +======= ======= 3.4.1 >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') @@ -6033,6 +6534,9 @@ DataStore implementations: >>>>>>> 7ae88ee16e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 082c87bda9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 8252893b4e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main @@ -6070,6 +6574,7 @@ libraryDependencies ++= Seq( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "org.locationtech.geomesa" %% "geomesa-utils" % "3.5.1" ======= @@ -6093,6 +6598,9 @@ libraryDependencies ++= Seq( <<<<<<< HEAD <<<<<<< HEAD "org.locationtech.geomesa" %% "geomesa-utils" % "3.5.1" +======= + "org.locationtech.geomesa" %% "geomesa-utils" % "4.0.4" +>>>>>>> locationtech-main ======= ======= >>>>>>> 6d17d625fd ([maven-release-plugin] prepare for next development iteration) @@ -6111,10 +6619,13 @@ libraryDependencies ++= Seq( ======= >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main <<<<<<< HEAD +======= +>>>>>>> locationtech-main "org.locationtech.geomesa" %% "geomesa-utils" % "4.0.0" ======= ======= @@ -6169,6 +6680,7 @@ libraryDependencies ++= Seq( >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) @@ -6179,12 +6691,17 @@ libraryDependencies ++= Seq( ======= >>>>>>> locationtech-main ======= +>>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main +======= ======= "org.locationtech.geomesa" %% "geomesa-utils" % "3.4.1" >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') @@ -6281,6 +6798,9 @@ libraryDependencies ++= Seq( >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) >>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 05410a7682 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main ) ``` @@ -6355,6 +6875,7 @@ libraryDependencies ++= Seq( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -6497,6 +7018,8 @@ libraryDependencies ++= Seq( >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main **Development version: 4.1.0-SNAPSHOT** ======= **Development version: 3.3.0-SNAPSHOT** @@ -6505,6 +7028,7 @@ libraryDependencies ++= Seq( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= **Development version: 3.4.0-SNAPSHOT** >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) @@ -14835,6 +15359,8 @@ libraryDependencies ++= Seq( **Development version: 3.3.0-SNAPSHOT** >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= **Development version: 3.4.0-SNAPSHOT** >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) ======= @@ -14895,13 +15421,17 @@ libraryDependencies ++= Seq( >>>>>>> 243797ba3c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 59c99fa93a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD **Development version: 3.4.0-SNAPSHOT** ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -20274,6 +20804,8 @@ libraryDependencies ++= Seq( ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 947a867d1c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) **Development version: 3.4.0-SNAPSHOT** ======= @@ -20327,6 +20859,9 @@ libraryDependencies ++= Seq( >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) ======= @@ -20442,12 +20977,15 @@ libraryDependencies ++= Seq( ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main **Development version: 3.5.0-SNAPSHOT** ======= **Development version: 4.0.0-SNAPSHOT** @@ -20474,6 +21012,7 @@ libraryDependencies ++= Seq( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -20483,6 +21022,11 @@ libraryDependencies ++= Seq( >>>>>>> 08ec6e9fa0 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +>>>>>>> 3c071a6b3e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -20537,9 +21081,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3a2e956065 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= **Development version: 3.4.0-SNAPSHOT** @@ -20588,9 +21135,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6d17d625fd ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> locationtech-main ======= @@ -20600,9 +21150,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 947a867d1c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c1f99f4bcb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -20612,9 +21165,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> e6e1f4bdd5 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c3c5dd0ebb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -20631,9 +21187,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 1562748d0b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8d9c3c2d16 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -20646,9 +21205,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 737fb2cb2c ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) @@ -20666,9 +21228,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 10910a4865 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 60ee91581e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -20684,9 +21249,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 65ba54511b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -20696,9 +21264,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 9e7e1887a7 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ab3b2c49db ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD ======= @@ -20713,17 +21284,23 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 23c0241798 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 338d952d43 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> a910ae135f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4c361f07da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= **Development version: 3.3.0-SNAPSHOT** @@ -20732,9 +21309,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> ab4d758ed7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f8fd014f1f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= **Development version: 3.4.0-SNAPSHOT** @@ -20743,9 +21323,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 20da909f0e ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -20753,17 +21336,23 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 941104fee8 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c558052945 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0088e6eff1 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0970537f16 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -20771,33 +21360,45 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 417ad813eb ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 85663f71c4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9627a2de6a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f302a54949 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b2cada94f0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) @@ -20806,9 +21407,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -20819,9 +21423,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 2c62962643 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bb1e627b99 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -20830,9 +21437,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5f17de37ee (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -20842,26 +21452,35 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8d80a87f7e ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> bdbced26d4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a788dfac03 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= **Development version: 3.3.0-SNAPSHOT** @@ -20870,9 +21489,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> c8e80535d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2024fa80f3 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= **Development version: 3.4.0-SNAPSHOT** @@ -20881,9 +21503,12 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> a0c34ab601 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a801bb2986 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -20891,18 +21516,24 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> 243797ba3c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 60b2734c49 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 59c99fa93a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5fae301729 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -20910,13 +21541,17 @@ libraryDependencies ++= Seq( <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= **Development version: 3.5.0-SNAPSHOT** >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -23843,6 +24478,8 @@ libraryDependencies ++= Seq( >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main      [![Build Status](https://github.com/locationtech/geomesa/actions/workflows/build-and-test-2.12.yml/badge.svg?branch=main)](https://github.com/locationtech/geomesa/actions/workflows/build-and-test-2.12.yml?query=branch%3Amain) @@ -23903,6 +24540,7 @@ environment variable to point to the root of your JDK. Example from a Mac: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1bb69524c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) To build for a different Scala version (e.g. 2.13), run the following script, then build as normal: @@ -35413,11 +36051,17 @@ To build for a different Scala version (e.g. 2.13), run the following script, th ======= ======= ======= +To build for a different Scala version (e.g. 2.13), run the following script, then build as normal: + + ./build/change-scala-version.sh 2.13 +>>>>>>> locationtech-main +======= To build for a different Scala version (e.g. 2.11), run the following script, then build as normal: ./build/change-scala-version.sh 2.11 >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 6d9a5b626 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -35474,3 +36118,7 @@ See [CITATION](CITATION) See [CITATION](CITATION) >>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +See [CITATION](CITATION) +>>>>>>> 73e3ca4b4 (Merge pull request #3524 from cffk/merid-update-fix) +>>>>>>> locationtech-main diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 51fefbeac47c..102aeb15e31d 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -110,6 +110,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1280,11 +1281,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2391,6 +2395,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2399,6 +2405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2891,12 +2898,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3272,6 +3286,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3279,12 +3301,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3325,6 +3351,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3338,6 +3369,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3456,11 +3488,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3471,11 +3507,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3619,6 +3658,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3630,6 +3673,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3908,6 +3952,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3919,6 +3969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4066,6 +4117,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4078,6 +4131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6697,6 +6751,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6793,6 +6849,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8268,6 +8325,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8286,6 +8345,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9781,12 +9841,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12485,6 +12548,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12492,6 +12557,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12534,9 +12600,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14092,6 +14161,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14099,6 +14172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14165,10 +14239,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14186,10 +14285,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14223,19 +14330,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15304,11 +15430,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15326,6 +15457,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/build/README.md b/build/README.md index 1237d3ab8a9c..1b84425a0130 100644 --- a/build/README.md +++ b/build/README.md @@ -431,6 +431,7 @@ To build for a different Scala version (e.g. 2.13), run the following script, th <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -581,8 +582,13 @@ To build for a different Scala version (e.g. 2.11), run the following script, th >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= To build for a different Scala version (e.g. 2.11), run the following script, then build as normal: ./build/change-scala-version.sh 2.11 >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main diff --git a/build/cqs.tsv b/build/cqs.tsv index 24cdc9f245a6..a7befc30baa6 100644 --- a/build/cqs.tsv +++ b/build/cqs.tsv @@ -987,6 +987,7 @@ org.apache.spark:spark-sql_2.12 3.3.1 provided <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= org.scala-lang:scala-compiler 2.12.17 provided ======= @@ -1088,6 +1089,11 @@ org.scala-lang:scala-compiler 2.12.17 provided ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +org.scala-lang:scala-compiler 2.12.17 provided +======= +======= +>>>>>>> locationtech-main org.apache.accumulo:accumulo-hadoop-mapreduce 2.0.0 provided org.apache.accumulo:accumulo-start 2.0.0 provided org.apache.hadoop:hadoop-annotations 2.8.5 provided @@ -1111,6 +1117,7 @@ org.apache.spark:spark-sql_2.12 2.4.7 provided <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD org.scala-lang:scala-compiler 2.12.13 provided <<<<<<< HEAD ======= @@ -1278,6 +1285,10 @@ org.scala-lang:scala-compiler 2.12.13 provided org.scala-lang:scala-compiler 2.12.13 provided >>>>>>> 73f3a8cb69 (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +org.scala-lang:scala-compiler 2.12.13 provided +>>>>>>> 73f3a8cb69 (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main org.slf4j:slf4j-reload4j 1.7.36 provided <<<<<<< HEAD org.springframework.security:spring-security-core 5.8.3 provided @@ -1367,6 +1378,7 @@ org.apache.accumulo:accumulo-test 2.0.1 test <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1506,6 +1518,8 @@ org.apache.accumulo:accumulo-test 2.0.1 test >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main org.apache.arrow:arrow-vector tests:11.0.0 test org.apache.cassandra:cassandra-all 3.11.14 test org.apache.cassandra:cassandra-thrift 3.11.14 test @@ -1519,6 +1533,7 @@ org.apache.cassandra:cassandra-all 3.0.0 test <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1614,6 +1629,9 @@ org.apache.cassandra:cassandra-all 3.0.0 test ======= >>>>>>> 1b8cbf843 (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> 1b8cbf843 (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main org.apache.curator:curator-test 4.3.0 test org.apache.hadoop:hadoop-minicluster 2.10.2 test org.apache.hbase:hbase-testing-util 1.4.14 test @@ -1627,6 +1645,7 @@ org.apache.kafka:kafka-streams-test-utils 2.8.2 test <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 73f3a8cb6 (GEOMESA-3198 Kafka streams integration (#2854)) ======= @@ -1692,6 +1711,8 @@ org.apache.kafka:kafka-streams-test-utils 2.8.2 test >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main org.apache.kafka:kafka_2.12 test:2.8.2 test org.apache.logging.log4j:log4j-api 2.19.0 test org.apache.logging.log4j:log4j-core 2.19.0 test @@ -1703,6 +1724,7 @@ org.cassandraunit:cassandra-unit 3.7.1.0 test <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1877,6 +1899,9 @@ org.apache.cassandra:cassandra-all 3.0.0 test ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main org.apache.curator:curator-test 2.7.1 test org.apache.hadoop:hadoop-minicluster 2.8.5 test org.apache.hbase:hbase-testing-util 1.4.12 test @@ -1891,6 +1916,7 @@ org.apache.kafka:kafka-streams-test-utils 2.1.1 test <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2170,6 +2196,11 @@ org.cassandraunit:cassandra-unit 2.2.2.1 test org.cassandraunit:cassandra-unit 2.2.2.1 test >>>>>>> 1b8cbf843 (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +org.cassandraunit:cassandra-unit 2.2.2.1 test +>>>>>>> 1b8cbf843 (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main org.codehaus.groovy:groovy-jsr223 2.4.5 test org.jruby:jruby 9.0.4.0 test org.mockito:mockito-all 1.8.5 test diff --git a/data/proj.ini b/data/proj.ini index 64b2eb0f99d3..2ed4a9f64fbf 100644 --- a/data/proj.ini +++ b/data/proj.ini @@ -22,6 +22,7 @@ cache_ttl_sec = 86400 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -158,6 +159,8 @@ cache_ttl_sec = 86400 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main ; Filename of the Certificate Authority (CA) bundle. ; Can be overriden with the PROJ_CURL_CA_BUNDLE / CURL_CA_BUNDLE environment variable. ; (added in PROJ 9.0) diff --git a/data/projjson.schema.json b/data/projjson.schema.json index 2bd633be993c..641fce0ac231 100644 --- a/data/projjson.schema.json +++ b/data/projjson.schema.json @@ -18,6 +18,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -157,6 +158,9 @@ ======= { "$ref": "#/definitions/concatenated_operation" } >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + { "$ref": "#/definitions/concatenated_operation" } +>>>>>>> locationtech-main ], "definitions": { @@ -243,6 +247,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -370,6 +375,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "id": { "$ref": "#/definitions/id" }, "ids": { "$ref": "#/definitions/ids" } }, @@ -494,6 +501,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -632,6 +640,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "coordinate_system": { "type": "object", "properties": { @@ -896,6 +906,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "anchor_epoch": {}, ======= @@ -1001,6 +1012,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "ellipsoid": {}, "prime_meridian": {}, "frame_reference_epoch": { "type": "number" }, @@ -1031,6 +1044,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "anchor_epoch": {}, ======= @@ -1136,6 +1150,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "frame_reference_epoch": { "type": "number" }, "$schema" : {}, "scope": {}, @@ -1290,6 +1306,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "anchor_epoch": { "type": "number" }, ======= @@ -1395,6 +1412,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "ellipsoid": { "$ref": "#/definitions/ellipsoid" }, "prime_meridian": { "$ref": "#/definitions/prime_meridian" }, "$schema" : {}, @@ -1897,6 +1916,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "anchor_epoch": { "type": "number" }, ======= @@ -2002,6 +2022,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "$schema" : {}, "scope": {}, "area": {}, diff --git a/data/sql/alias_name.sql b/data/sql/alias_name.sql index b415ed5b093d..39514de3cc2a 100644 --- a/data/sql/alias_name.sql +++ b/data/sql/alias_name.sql @@ -693,6 +693,7 @@ INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','5100','Approximate Mean <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -831,6 +832,8 @@ INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1351','SMITB20-IRF','EP >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('projected_crs','EPSG','21100','Genuk / NEIEZ','EPSG'); INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2140','NAD83(CSRS98) / SCoPQ zone 3','EPSG'); INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2141','NAD83(CSRS98) / SCoPQ zone 4','EPSG'); @@ -7458,6 +7461,7 @@ INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','9069','746','EPSG'); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7580,6 +7584,9 @@ INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','9069','ETRF2014- LatLon', ======= INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','9069','ETRF2014- LatLon','EPSG'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','9069','ETRF2014- LatLon','EPSG'); +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9672','CD Norway','EPSG'); INSERT INTO "alias_name" VALUES('compound_crs','EPSG','9656','PL-ETRF2000 + Kronzstad 86','EPSG'); INSERT INTO "alias_name" VALUES('compound_crs','EPSG','9657','PL-ETRF2000 + Kronzstad 86','EPSG'); @@ -7609,6 +7616,7 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9390','766','EPSG'); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7763,6 +7771,11 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9390','EVRF2019mean-NHt', INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9389','765','EPSG'); INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9389','EVRF2019-NHt','EPSG'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9390','EVRF2019mean-NHt','EPSG'); +INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9389','765','EPSG'); +INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9389','EVRF2019-NHt','EPSG'); +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('projected_crs','EPSG','9749','NAD83(2011) / AL W (ftUS)','EPSG'); INSERT INTO "alias_name" VALUES('projected_crs','EPSG','9748','NAD83(2011) / AL E (ftUS)','EPSG'); INSERT INTO "alias_name" VALUES('projected_crs','EPSG','20904','GSK-2011 / 6-degree Gauss-Kruger zone 4','EPSG'); @@ -8163,6 +8176,7 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9245','335','EPSG'); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8285,6 +8299,9 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9245','CGVD2013(CGG2013a) ======= INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9245','CGVD2013(CGG2013a) - OHt','EPSG'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9245','CGVD2013(CGG2013a) - OHt','EPSG'); +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('compound_crs','EPSG','20037','NAD83(CSRS) 2002 + CGVD2013(CGG2013a) epoch 2002 height','EPSG'); INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','9988','802','EPSG'); INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','9988','ITRF2020 - XYZ','EPSG'); @@ -8352,6 +8369,7 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','8051','Approximate MSL de <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8508,3 +8526,5 @@ INSERT INTO "alias_name" VALUES('compound_crs','EPSG','10281','ETRS89 / RBEPP12 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main diff --git a/data/sql/compound_crs.sql b/data/sql/compound_crs.sql index a930058dcddc..5fdc70ea7968 100644 --- a/data/sql/compound_crs.sql +++ b/data/sql/compound_crs.sql @@ -807,6 +807,7 @@ INSERT INTO "usage" VALUES('EPSG','18606','compound_crs','EPSG','10174','EPSG',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -963,6 +964,8 @@ INSERT INTO "usage" VALUES('EPSG','19185','compound_crs','EPSG','10281','EPSG',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "compound_crs" VALUES('EPSG','20001','ETRS89 + SVD2006 height',NULL,'EPSG','4258','EPSG','20000',0); INSERT INTO "usage" VALUES('EPSG','17956','compound_crs','EPSG','20001','EPSG','4058','EPSG','1026'); INSERT INTO "compound_crs" VALUES('EPSG','20003','MWC18 Grid + ODN height',NULL,'EPSG','20002','EPSG','5701',0); diff --git a/data/sql/concatenated_operation.sql b/data/sql/concatenated_operation.sql index cace20ce326b..1418a337cd33 100644 --- a/data/sql/concatenated_operation.sql +++ b/data/sql/concatenated_operation.sql @@ -35,6 +35,7 @@ INSERT INTO "usage" VALUES('EPSG','10276','concatenated_operation','EPSG','7811' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -189,6 +190,11 @@ INSERT INTO "concatenated_operation" VALUES('EPSG','7965','Poolbeg height (ft(Br INSERT INTO "usage" VALUES('EPSG','10349','concatenated_operation','EPSG','7965','EPSG','1305','EPSG','1059'); INSERT INTO "concatenated_operation" VALUES('EPSG','7967','Poolbeg height (ft(Br36)) to Belfast height (1)','','EPSG','5754','EPSG','5732',0.1,'1',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "concatenated_operation" VALUES('EPSG','7965','Poolbeg height (ft(Br36)) to Malin Head height (1)','','EPSG','5754','EPSG','5731',0.1,'1',0); +INSERT INTO "usage" VALUES('EPSG','10349','concatenated_operation','EPSG','7965','EPSG','1305','EPSG','1059'); +INSERT INTO "concatenated_operation" VALUES('EPSG','7967','Poolbeg height (ft(Br36)) to Belfast height (1)','','EPSG','5754','EPSG','5732',0.1,'1',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','10351','concatenated_operation','EPSG','7967','EPSG','2530','EPSG','1059'); INSERT INTO "concatenated_operation" VALUES('EPSG','7973','NGVD29 height (ftUS) to NAVD88 height (1)','','EPSG','5702','EPSG','5703',0.02,'IOGP - US Conus W',0); INSERT INTO "usage" VALUES('EPSG','10356','concatenated_operation','EPSG','7973','EPSG','2950','EPSG','1099'); diff --git a/data/sql/conversion.sql b/data/sql/conversion.sql index a1fd5a952e70..952fa830998c 100644 --- a/data/sql/conversion.sql +++ b/data/sql/conversion.sql @@ -141,6 +141,7 @@ INSERT INTO "usage" VALUES('EPSG','9089','conversion','EPSG','4454','EPSG','2235 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -263,6 +264,9 @@ INSERT INTO "conversion" VALUES('EPSG','4460','Australian Centre for Remote Sens ======= INSERT INTO "conversion" VALUES('EPSG','4460','Australian Centre for Remote Sensing Lambert Conformal Projection','Created by AUSLIG prior to incorporation into Geoscience Australia. See also GALCC (proj code 17362).','EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',-27.0,'EPSG','9102','EPSG','8822','Longitude of false origin',132.0,'EPSG','9102','EPSG','8823','Latitude of 1st standard parallel',-18.0,'EPSG','9102','EPSG','8824','Latitude of 2nd standard parallel',-36.0,'EPSG','9102','EPSG','8826','Easting at false origin',0.0,'EPSG','9001','EPSG','8827','Northing at false origin',0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "conversion" VALUES('EPSG','4460','Australian Centre for Remote Sensing Lambert Conformal Projection','Created by AUSLIG prior to incorporation into Geoscience Australia. See also GALCC (proj code 17362).','EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',-27.0,'EPSG','9102','EPSG','8822','Longitude of false origin',132.0,'EPSG','9102','EPSG','8823','Latitude of 1st standard parallel',-18.0,'EPSG','9102','EPSG','8824','Latitude of 2nd standard parallel',-36.0,'EPSG','9102','EPSG','8826','Easting at false origin',0.0,'EPSG','9001','EPSG','8827','Northing at false origin',0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9091','conversion','EPSG','4460','EPSG','2575','EPSG','1047'); INSERT INTO "conversion" VALUES('EPSG','4648','UTM zone 32N with prefix','Variant of UTM zone 32N (code 16032) with zone number prefixed to easting.','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',0.0,'EPSG','9102','EPSG','8802','Longitude of natural origin',9.0,'EPSG','9102','EPSG','8805','Scale factor at natural origin',0.9996,'EPSG','9201','EPSG','8806','False easting',32500000.0,'EPSG','9001','EPSG','8807','False northing',0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('EPSG','9115','conversion','EPSG','4648','EPSG','2861','EPSG','1142'); @@ -415,6 +419,7 @@ INSERT INTO "usage" VALUES('EPSG','9301','conversion','EPSG','5219','EPSG','1079 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -537,6 +542,9 @@ INSERT INTO "conversion" VALUES('EPSG','5220','Modified Krovak East North','Long ======= INSERT INTO "conversion" VALUES('EPSG','5220','Modified Krovak East North','Longitude is referenced to the Ferro meridian. Replaces Modified Krovak south-orientated projection (code 5219) for GIS purposes.','EPSG','1043','Krovak Modified (North Orientated)','EPSG','8811','Latitude of projection centre',49.3,'EPSG','9110','EPSG','8833','Longitude of origin',42.3,'EPSG','9110','EPSG','1036','Co-latitude of cone axis',30.1717303,'EPSG','9110','EPSG','8818','Latitude of pseudo standard parallel',78.3,'EPSG','9110','EPSG','8819','Scale factor on pseudo standard parallel',0.9999,'EPSG','9201','EPSG','8806','False easting',5000000.0,'EPSG','9001','EPSG','8807','False northing',5000000.0,'EPSG','9001',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "conversion" VALUES('EPSG','5220','Modified Krovak East North','Longitude is referenced to the Ferro meridian. Replaces Modified Krovak south-orientated projection (code 5219) for GIS purposes.','EPSG','1043','Krovak Modified (North Orientated)','EPSG','8811','Latitude of projection centre',49.3,'EPSG','9110','EPSG','8833','Longitude of origin',42.3,'EPSG','9110','EPSG','1036','Co-latitude of cone axis',30.1717303,'EPSG','9110','EPSG','8818','Latitude of pseudo standard parallel',78.3,'EPSG','9110','EPSG','8819','Scale factor on pseudo standard parallel',0.9999,'EPSG','9201','EPSG','8806','False easting',5000000.0,'EPSG','9001','EPSG','8807','False northing',5000000.0,'EPSG','9001',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9302','conversion','EPSG','5220','EPSG','1079','EPSG','1189'); INSERT INTO "conversion" VALUES('EPSG','5222','Gabon Transverse Mercator','For topographic mapping and survey applications see projection code 5522.','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',0.0,'EPSG','9102','EPSG','8802','Longitude of natural origin',12.0,'EPSG','9102','EPSG','8805','Scale factor at natural origin',0.9996,'EPSG','9201','EPSG','8806','False easting',500000.0,'EPSG','9001','EPSG','8807','False northing',500000.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('EPSG','9303','conversion','EPSG','5222','EPSG','3249','EPSG','1165'); @@ -2103,6 +2111,7 @@ INSERT INTO "usage" VALUES('EPSG','18487','conversion','EPSG','10148','EPSG','46 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2237,6 +2246,8 @@ INSERT INTO "usage" VALUES('EPSG','18704','conversion','EPSG','10198','EPSG','46 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('EPSG','10201','Arizona Coordinate System East zone','','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',31.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-110.1,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9999,'EPSG','9201','EPSG','8806','False easting',500000.0,'EPSG','9003','EPSG','8807','False northing',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('EPSG','11105','conversion','EPSG','10201','EPSG','2167','EPSG','1142'); INSERT INTO "conversion" VALUES('EPSG','10202','Arizona Coordinate System Central zone','','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',31.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-111.55,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9999,'EPSG','9201','EPSG','8806','False easting',500000.0,'EPSG','9003','EPSG','8807','False northing',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -2250,6 +2261,7 @@ INSERT INTO "usage" VALUES('EPSG','11107','conversion','EPSG','10203','EPSG','21 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2382,6 +2394,8 @@ INSERT INTO "usage" VALUES('EPSG','18743','conversion','EPSG','10226','EPSG','46 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('EPSG','10231','SPCS83 Arizona East zone (meters)','State law defines origin in International feet. FE = 700000ft. See code 15304 for equivalent non-metric definition.','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',31.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-110.1,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9999,'EPSG','9201','EPSG','8806','False easting',213360.0,'EPSG','9001','EPSG','8807','False northing',0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('EPSG','11108','conversion','EPSG','10231','EPSG','2167','EPSG','1142'); INSERT INTO "conversion" VALUES('EPSG','10232','SPCS83 Arizona Central zone (meters)','State law defines origin in International feet. FE = 700000ft. See code 15305 for equivalent non-metric definition.','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',31.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-111.55,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9999,'EPSG','9201','EPSG','8806','False easting',213360.0,'EPSG','9001','EPSG','8807','False northing',0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -2395,6 +2409,7 @@ INSERT INTO "usage" VALUES('EPSG','11110','conversion','EPSG','10233','EPSG','21 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2529,6 +2544,8 @@ INSERT INTO "usage" VALUES('EPSG','19186','conversion','EPSG','10279','EPSG','46 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('EPSG','10301','Arkansas CS27 North','','EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',34.2,'EPSG','9110','EPSG','8822','Longitude of false origin',-92.0,'EPSG','9110','EPSG','8823','Latitude of 1st standard parallel',36.14,'EPSG','9110','EPSG','8824','Latitude of 2nd standard parallel',34.56,'EPSG','9110','EPSG','8826','Easting at false origin',2000000.0,'EPSG','9003','EPSG','8827','Northing at false origin',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('EPSG','11111','conversion','EPSG','10301','EPSG','2169','EPSG','1142'); INSERT INTO "conversion" VALUES('EPSG','10302','Arkansas CS27 South','','EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',32.4,'EPSG','9110','EPSG','8822','Longitude of false origin',-92.0,'EPSG','9110','EPSG','8823','Latitude of 1st standard parallel',34.46,'EPSG','9110','EPSG','8824','Latitude of 2nd standard parallel',33.18,'EPSG','9110','EPSG','8826','Easting at false origin',2000000.0,'EPSG','9003','EPSG','8827','Northing at false origin',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -5796,6 +5813,7 @@ INSERT INTO "usage" VALUES('EPSG','13034','conversion','EPSG','19956','EPSG','13 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5918,6 +5936,9 @@ INSERT INTO "conversion" VALUES('EPSG','19957','Rectified Skew Orthomorphic Born ======= INSERT INTO "conversion" VALUES('EPSG','19957','Rectified Skew Orthomorphic Borneo Grid (feet)','See 19956 and 19958 for chains and metres versions. If using Hotine Oblique Mercator (variant A) method (code 9812) FE = FN = 0 ftSe. Being replaced by metric version (code 19958).','EPSG','9815','Hotine Oblique Mercator (variant B)','EPSG','8811','Latitude of projection centre',4.0,'EPSG','9110','EPSG','8812','Longitude of projection centre',115.0,'EPSG','9110','EPSG','8813','Azimuth of initial line',53.18569537,'EPSG','9110','EPSG','8814','Angle from Rectified to Skew Grid',53.07483685,'EPSG','9110','EPSG','8815','Scale factor on initial line',0.99984,'EPSG','9201','EPSG','8816','Easting at projection centre',1937263.44,'EPSG','9041','EPSG','8817','Northing at projection centre',1452947.58,'EPSG','9041',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "conversion" VALUES('EPSG','19957','Rectified Skew Orthomorphic Borneo Grid (feet)','See 19956 and 19958 for chains and metres versions. If using Hotine Oblique Mercator (variant A) method (code 9812) FE = FN = 0 ftSe. Being replaced by metric version (code 19958).','EPSG','9815','Hotine Oblique Mercator (variant B)','EPSG','8811','Latitude of projection centre',4.0,'EPSG','9110','EPSG','8812','Longitude of projection centre',115.0,'EPSG','9110','EPSG','8813','Azimuth of initial line',53.18569537,'EPSG','9110','EPSG','8814','Angle from Rectified to Skew Grid',53.07483685,'EPSG','9110','EPSG','8815','Scale factor on initial line',0.99984,'EPSG','9201','EPSG','8816','Easting at projection centre',1937263.44,'EPSG','9041','EPSG','8817','Northing at projection centre',1452947.58,'EPSG','9041',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','13035','conversion','EPSG','19957','EPSG','3977','EPSG','1142'); INSERT INTO "conversion" VALUES('EPSG','19958','Rectified Skew Orthomorphic Borneo Grid (metres)','See 19956 and 19957 for chains and feet versions. Uses Sear''s 1922 British yard-metre ratio as given by Bomford as 39.370147 inches per metre. If using Hotine Oblique Mercator (variant A) method (code 9812) FE = FN = 0 m.','EPSG','9815','Hotine Oblique Mercator (variant B)','EPSG','8811','Latitude of projection centre',4.0,'EPSG','9110','EPSG','8812','Longitude of projection centre',115.0,'EPSG','9110','EPSG','8813','Azimuth of initial line',53.18569537,'EPSG','9110','EPSG','8814','Angle from Rectified to Skew Grid',53.07483685,'EPSG','9110','EPSG','8815','Scale factor on initial line',0.99984,'EPSG','9201','EPSG','8816','Easting at projection centre',590476.87,'EPSG','9001','EPSG','8817','Northing at projection centre',442857.65,'EPSG','9001',0); INSERT INTO "usage" VALUES('EPSG','13036','conversion','EPSG','19958','EPSG','1362','EPSG','1142'); @@ -5930,6 +5951,7 @@ INSERT INTO "usage" VALUES('EPSG','13037','conversion','EPSG','19959','EPSG','11 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6052,6 +6074,9 @@ INSERT INTO "conversion" VALUES('EPSG','19960','Prince Edward Isl. Stereographic ======= INSERT INTO "conversion" VALUES('EPSG','19960','Prince Edward Isl. Stereographic (NAD83)','False Easting and False Northing changed from values used with ATS77 (which were FE=700000m; FN=400000m) to these new values when used with NAD83 (CSRS). New values are FE=400000m; FN=800000m; adopted in 2000.','EPSG','9809','Oblique Stereographic','EPSG','8801','Latitude of natural origin',47.15,'EPSG','9110','EPSG','8802','Longitude of natural origin',-63.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.999912,'EPSG','9201','EPSG','8806','False easting',400000.0,'EPSG','9001','EPSG','8807','False northing',800000.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "conversion" VALUES('EPSG','19960','Prince Edward Isl. Stereographic (NAD83)','False Easting and False Northing changed from values used with ATS77 (which were FE=700000m; FN=400000m) to these new values when used with NAD83 (CSRS). New values are FE=400000m; FN=800000m; adopted in 2000.','EPSG','9809','Oblique Stereographic','EPSG','8801','Latitude of natural origin',47.15,'EPSG','9110','EPSG','8802','Longitude of natural origin',-63.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.999912,'EPSG','9201','EPSG','8806','False easting',400000.0,'EPSG','9001','EPSG','8807','False northing',800000.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','13038','conversion','EPSG','19960','EPSG','1533','EPSG','1142'); INSERT INTO "conversion" VALUES('EPSG','19961','Belgian Lambert 72','Introduced in 2000. Equivalent to Belge Lambert 72 (code 19902). If software cannot handle latitude of false origin of 90°N, use latitude of false origin = 50°47''57.704"N with northing at false origin = 165 372.956 m.','EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',90.0,'EPSG','9110','EPSG','8822','Longitude of false origin',4.2202952,'EPSG','9110','EPSG','8823','Latitude of 1st standard parallel',51.100000204,'EPSG','9110','EPSG','8824','Latitude of 2nd standard parallel',49.500000204,'EPSG','9110','EPSG','8826','Easting at false origin',150000.013,'EPSG','9001','EPSG','8827','Northing at false origin',5400088.438,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,0); diff --git a/data/sql/esri.sql b/data/sql/esri.sql index d96801d2d202..8422e93eac70 100644 --- a/data/sql/esri.sql +++ b/data/sql/esri.sql @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -152,6 +153,10 @@ INSERT INTO "metadata" VALUES('ESRI.DATE', '2023-19-01'); INSERT INTO "metadata" VALUES('ESRI.VERSION', 'ArcGIS Pro 3.0'); INSERT INTO "metadata" VALUES('ESRI.DATE', '2022-07-09'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "metadata" VALUES('ESRI.VERSION', 'ArcGIS Pro 3.0'); +INSERT INTO "metadata" VALUES('ESRI.DATE', '2022-07-09'); +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('unit_of_measure','EPSG','1025','Millimeter','ESRI'); INSERT INTO alias_name VALUES('unit_of_measure','EPSG','1033','Centimeter','ESRI'); INSERT INTO alias_name VALUES('unit_of_measure','EPSG','9001','Meter','ESRI'); @@ -1901,6 +1906,7 @@ INSERT INTO alias_name VALUES('geodetic_crs','EPSG','9695','REDGEOMIN_(3D)','ESR <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2003,6 +2009,8 @@ INSERT INTO alias_name VALUES('geodetic_crs','EPSG','20041','SIRGAS-Chile_2021', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "geodetic_datum" VALUES('ESRI','1305','ETRF2000_Poland','ETRF2000 Poland','EPSG','7019','EPSG','8901',NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '1305_USAGE','geodetic_datum','ESRI','1305','EPSG','1192','EPSG','1024'); INSERT INTO "geodetic_crs" VALUES('ESRI','9701','ETRF2000-PL_(3D)',NULL,'geographic 2D','EPSG','6422','ESRI','1305',NULL,0); @@ -2027,6 +2035,7 @@ INSERT INTO "usage" VALUES('ESRI', '9763_USAGE','geodetic_crs','ESRI','9763','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2123,6 +2132,8 @@ INSERT INTO "usage" VALUES('ESRI', '9763_USAGE','geodetic_crs','ESRI','9763','EP >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "geodetic_datum" VALUES('ESRI','106001','D_WGS_1966','WGS 1966','ESRI','107001','EPSG','8901',NULL,NULL,NULL,NULL,1); INSERT INTO "usage" VALUES('ESRI', '106001_USAGE','geodetic_datum','ESRI','106001','EPSG','1262','EPSG','1024'); INSERT INTO "geodetic_crs" VALUES('ESRI','37001','GCS_WGS_1966',NULL,'geographic 2D','EPSG','6422','ESRI','106001',NULL,1); @@ -2177,6 +2188,7 @@ INSERT INTO "geodetic_datum" VALUES('ESRI','106204','D_Hjorsey_1955','Hjorsey 19 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2331,6 +2343,11 @@ INSERT INTO "usage" VALUES('ESRI', '106204_USAGE','geodetic_datum','ESRI','10620 INSERT INTO "geodetic_crs" VALUES('ESRI','37204','GCS_Hjorsey_1955',NULL,'geographic 2D','EPSG','6422','ESRI','106204',NULL,1); INSERT INTO "usage" VALUES('ESRI', '37204_USAGE','geodetic_crs','ESRI','37204','EPSG','4662','EPSG','1024'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "usage" VALUES('ESRI', '106204_USAGE','geodetic_datum','ESRI','106204','EPSG','4662','EPSG','1024'); +INSERT INTO "geodetic_crs" VALUES('ESRI','37204','GCS_Hjorsey_1955',NULL,'geographic 2D','EPSG','6422','ESRI','106204',NULL,1); +INSERT INTO "usage" VALUES('ESRI', '37204_USAGE','geodetic_crs','ESRI','37204','EPSG','4662','EPSG','1024'); +>>>>>>> locationtech-main INSERT INTO "supersession" VALUES('geodetic_crs','ESRI','37204','geodetic_crs','EPSG','4658','ESRI',1); INSERT INTO "geodetic_datum" VALUES('ESRI','106205','D_Hong_Kong_1963_67','Hong Kong 1963(67)','EPSG','7022','EPSG','8901',NULL,NULL,NULL,NULL,1); INSERT INTO "usage" VALUES('ESRI', '106205_USAGE','geodetic_datum','ESRI','106205','EPSG','1118','EPSG','1024'); @@ -2618,6 +2635,7 @@ INSERT INTO "usage" VALUES('ESRI', '104023_USAGE','geodetic_crs','ESRI','104023' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2740,6 +2758,9 @@ INSERT INTO "extent" VALUES('ESRI','1','USA - California and borders of NV, AZ, ======= INSERT INTO "extent" VALUES('ESRI','1','USA - California and borders of NV, AZ, OR and MX','USA - California and borders of NV, AZ, OR and MX',32.25,42.53,-124.44,-113.6,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "extent" VALUES('ESRI','1','USA - California and borders of NV, AZ, OR and MX','USA - California and borders of NV, AZ, OR and MX',32.25,42.53,-124.44,-113.6,0); +>>>>>>> locationtech-main INSERT INTO "geodetic_datum" VALUES('ESRI','106012','California_SRS_Epoch_2017.50_(NAD83)','California SRS Epoch 2017.5 (NAD83)','EPSG','7019','EPSG','8901',NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '106012_USAGE','geodetic_datum','ESRI','106012','ESRI','1','EPSG','1024'); INSERT INTO "geodetic_crs" VALUES('ESRI','104024','California_SRS_Epoch_2017.50_(NAD83)',NULL,'geographic 2D','EPSG','6422','ESRI','106012',NULL,0); @@ -3043,6 +3064,7 @@ INSERT INTO "usage" VALUES('ESRI', '104645_USAGE','geodetic_crs','ESRI','104645' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3173,6 +3195,8 @@ INSERT INTO "usage" VALUES('ESRI', '104646_USAGE','geodetic_crs','ESRI','104646' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "geodetic_crs" VALUES('ESRI','104647','ONGD17_3D',NULL,'geographic 2D','EPSG','6422','ESRI','106027',NULL,1); INSERT INTO "usage" VALUES('ESRI', '104647_USAGE','geodetic_crs','ESRI','104647','EPSG','1183','EPSG','1024'); INSERT INTO "supersession" VALUES('geodetic_crs','ESRI','104647','geodetic_crs','EPSG','9293','ESRI',1); @@ -6230,6 +6254,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','5018','Lisbon_Portuguese_G <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6344,6 +6369,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','5042','WGS_1984_UPS_South_ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('projected_crs','EPSG','5048','ETRS_1989_TM35FIN_NE','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','5069','NAD_1927_Contiguous_USA_Albers','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','5070','NAD_1983_Contiguous_USA_Albers','ESRI'); @@ -7855,6 +7882,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_9713_USAGE','projected_crs','ESRI','971 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7919,6 +7947,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','9741','EOS21_Grid','ESRI') >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','9716','IGM95_UTM_Zone_34N',NULL,'EPSG','4400','EPSG','4670','EPSG','16034',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_9716_USAGE','projected_crs','ESRI','9716','EPSG','4187','EPSG','1024'); INSERT INTO "conversion" VALUES('ESRI','9741','unnamed',NULL,'EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',56.35,'EPSG','9102','EPSG','8802','Longitude of natural origin',-2.75,'EPSG','9102','EPSG','8805','Scale factor at natural origin',1.0,'EPSG','9201','EPSG','8806','False easting',74996.927,'EPSG','9001','EPSG','8807','False northing',133508.35,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -7931,6 +7961,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_9741_USAGE','projected_crs','ESRI','974 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8034,6 +8065,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','9741','EOS21_Grid','ESRI') >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('ESRI','9748','unnamed',NULL,'EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',30.5,'EPSG','9102','EPSG','8802','Longitude of natural origin',-85.83333333333333,'EPSG','9102','EPSG','8805','Scale factor at natural origin',0.99996,'EPSG','9201','EPSG','8806','False easting',656166.667,'EPSG','9003','EPSG','8807','False northing',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', 'CONV_9748_USAGE','conversion','ESRI','9748','EPSG','2154','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','9748','NAD_1983_2011_StatePlane_Alabama_East_(ftUS)',NULL,'EPSG','4497','EPSG','6318','ESRI','9748',NULL,0); @@ -8049,6 +8082,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_9749_USAGE','projected_crs','ESRI','974 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8192,6 +8226,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','9977','FNL22_Grid','ESRI') >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('ESRI','9761','unnamed',NULL,'EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',55.05,'EPSG','9102','EPSG','8802','Longitude of natural origin',-1.55,'EPSG','9102','EPSG','8805','Scale factor at natural origin',1.0,'EPSG','9201','EPSG','8806','False easting',112242.8512,'EPSG','9001','EPSG','8807','False northing',402313.7432,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', 'CONV_9761_USAGE','conversion','ESRI','9761','EPSG','4621','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','9761','ECML14_NB_Grid',NULL,'EPSG','4400','ESRI','9758','ESRI','9761',NULL,0); @@ -8206,6 +8242,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_9766_USAGE','projected_crs','ESRI','976 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8302,6 +8339,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_9766_USAGE','projected_crs','ESRI','976 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','20002','Pulkovo_1995_GK_Zone_2',NULL,'EPSG','4400','EPSG','4200','EPSG','16202',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_20002_USAGE','projected_crs','ESRI','20002','EPSG','1805','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','20003','Pulkovo_1995_GK_Zone_3',NULL,'EPSG','4400','EPSG','4200','EPSG','16203',NULL,0); @@ -8342,6 +8381,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','20032','Pulkovo_1995_GK_Zo <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8474,6 +8514,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_20050_USAGE','projected_crs','ESRI','20 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','20062','Pulkovo_1995_GK_Zone_2N',NULL,'EPSG','4400','EPSG','4200','EPSG','16302',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_20062_USAGE','projected_crs','ESRI','20062','EPSG','1805','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','20063','Pulkovo_1995_GK_Zone_3N',NULL,'EPSG','4400','EPSG','4200','EPSG','16303',NULL,0); @@ -8553,6 +8595,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','20824','Aratu_UTM_Zone_24S <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8698,6 +8741,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','21032','GSK-2011_Gauss-Kru >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','20904','GSK-2011_Gauss-Kruger_zone_4',NULL,'EPSG','4400','EPSG','7683','EPSG','16204',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_20904_USAGE','projected_crs','ESRI','20904','EPSG','1763','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','20905','GSK-2011_Gauss-Kruger_zone_5',NULL,'EPSG','4400','EPSG','7683','EPSG','16205',NULL,0); @@ -8823,6 +8868,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_21032_USAGE','projected_crs','ESRI','21 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8967,6 +9013,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','21032','GSK-2011_Gauss-Kru >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('projected_crs','EPSG','21035','Arc_1960_UTM_Zone_35S','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','21036','Arc_1960_UTM_Zone_36S','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','21037','Arc_1960_UTM_Zone_37S','ESRI'); @@ -8983,6 +9031,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','21150','Batavia_UTM_Zone_5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9185,6 +9234,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','21364','GSK-2011_GSK_3GK_C >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','21207','GSK-2011_GSK_3GK_zone_7',NULL,'EPSG','4400','EPSG','7683','EPSG','16907',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_21207_USAGE','projected_crs','ESRI','21207','EPSG','2747','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','21208','GSK-2011_GSK_3GK_zone_8',NULL,'EPSG','4400','EPSG','7683','EPSG','16908',NULL,0); @@ -9425,6 +9476,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_21364_USAGE','projected_crs','ESRI','21 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -9596,6 +9648,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','21364','GSK-2011_GSK_3GK_C >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('projected_crs','EPSG','21413','Beijing_1954_GK_Zone_13','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','21414','Beijing_1954_GK_Zone_14','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','21415','Beijing_1954_GK_Zone_15','ESRI'); @@ -9675,6 +9729,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','22197','Argentina_Zone_7', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10123,6 +10178,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','22465','NAD83(CSRS)v4_Albe >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('projected_crs','EPSG','22234','Cape_UTM_Zone_34S','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','22235','Cape_UTM_Zone_35S','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','22236','Cape_UTM_Zone_36S','ESRI'); @@ -10131,6 +10188,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','22391','Nord_Tunisie','ESR INSERT INTO alias_name VALUES('projected_crs','EPSG','22392','Sud_Tunisie','ESRI'); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -10153,6 +10211,8 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','22392','Sud_Tunisie','ESRI >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('projected_crs','EPSG','22521','Corrego_Alegre_UTM_Zone_21S','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','22522','Corrego_Alegre_UTM_Zone_22S','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','22523','Corrego_Alegre_UTM_Zone_23S','ESRI'); @@ -10165,6 +10225,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','22525','Corrego_Alegre_UTM <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10372,6 +10433,9 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','22700','Deir_ez_Zor_Levant ======= INSERT INTO alias_name VALUES('projected_crs','EPSG','22700','Deir_ez_Zor_Levant_Zone','ESRI'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO alias_name VALUES('projected_crs','EPSG','22700','Deir_ez_Zor_Levant_Zone','ESRI'); +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('projected_crs','EPSG','22770','Deir_ez_Zor_Syria_Lambert','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','22780','Deir_ez_Zor_Levant_Stereographic','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','22832','Douala_UTM_Zone_32N','ESRI'); @@ -11079,6 +11143,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','31469','DHDN_3_Degree_Gaus <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -11255,6 +11320,8 @@ INSERT INTO "projected_crs" VALUES('ESRI','31495','Germany_Zone_5',NULL,'EPSG',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','31491','Germany_Zone_1',NULL,'EPSG','4400','EPSG','4314','EPSG','16201',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_31491_USAGE','projected_crs','ESRI','31491','EPSG','3892','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','31492','Germany_Zone_2',NULL,'EPSG','4400','EPSG','4314','EPSG','16262',NULL,0); @@ -11266,6 +11333,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_31494_USAGE','projected_crs','ESRI','31 INSERT INTO "projected_crs" VALUES('ESRI','31495','Germany_Zone_5',NULL,'EPSG','4400','EPSG','4314','EPSG','16265',NULL,0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -11288,6 +11356,8 @@ INSERT INTO "projected_crs" VALUES('ESRI','31495','Germany_Zone_5',NULL,'EPSG',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('ESRI', 'PCRS_31495_USAGE','projected_crs','ESRI','31495','EPSG','1627','EPSG','1024'); INSERT INTO alias_name VALUES('projected_crs','EPSG','31528','Conakry_1905_UTM_Zone_28N','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','31529','Conakry_1905_UTM_Zone_29N','ESRI'); @@ -11485,6 +11555,7 @@ INSERT INTO alias_name VALUES('projected_crs','EPSG','32158','NAD_1983_StatePlan <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -11615,6 +11686,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_32159_USAGE','projected_crs','ESRI','32 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('projected_crs','EPSG','32161','NAD_1983_StatePlane_Puerto_Rico_Virgin_Islands_FIPS_5200','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','32164','NAD_1983_BLM_Zone_14N_ftUS','ESRI'); INSERT INTO alias_name VALUES('projected_crs','EPSG','32165','NAD_1983_BLM_Zone_15N_ftUS','ESRI'); @@ -12763,6 +12836,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102211_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -12917,6 +12991,11 @@ INSERT INTO "conversion" VALUES('ESRI','102212','unnamed',NULL,'EPSG','9802','La INSERT INTO "usage" VALUES('ESRI', 'CONV_102212_USAGE','conversion','ESRI','102212','EPSG','1419','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','102212','NAD_1983_WyLAM',NULL,'EPSG','4400','EPSG','4269','ESRI','102212',NULL,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "conversion" VALUES('ESRI','102212','unnamed',NULL,'EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',41.0,'EPSG','9102','EPSG','8822','Longitude of false origin',-107.5,'EPSG','9102','EPSG','8823','Latitude of 1st standard parallel',41.0,'EPSG','9102','EPSG','8824','Latitude of 2nd standard parallel',45.0,'EPSG','9102','EPSG','8826','Easting at false origin',500000.0,'EPSG','9001','EPSG','8827','Northing at false origin',200000.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,0); +INSERT INTO "usage" VALUES('ESRI', 'CONV_102212_USAGE','conversion','ESRI','102212','EPSG','1419','EPSG','1024'); +INSERT INTO "projected_crs" VALUES('ESRI','102212','NAD_1983_WyLAM',NULL,'EPSG','4400','EPSG','4269','ESRI','102212',NULL,0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('ESRI', 'PCRS_102212_USAGE','projected_crs','ESRI','102212','EPSG','1419','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','102213','NAD_1983_UTM_Zone_58N',NULL,'EPSG','4400','EPSG','4269','EPSG','16058',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_102213_USAGE','projected_crs','ESRI','102213','EPSG','2116','EPSG','1024'); @@ -14700,6 +14779,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102730_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14832,6 +14912,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102732_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('ESRI','102733','unnamed',NULL,'EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',31.83333333333333,'EPSG','9102','EPSG','8822','Longitude of false origin',-81.0,'EPSG','9102','EPSG','8823','Latitude of 1st standard parallel',32.5,'EPSG','9102','EPSG','8824','Latitude of 2nd standard parallel',34.83333333333334,'EPSG','9102','EPSG','8826','Easting at false origin',1999996.0,'EPSG','9003','EPSG','8827','Northing at false origin',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', 'CONV_102733_USAGE','conversion','ESRI','102733','EPSG','1409','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','102733','NAD_1983_StatePlane_South_Carolina_FIPS_3900_Feet',NULL,'EPSG','4497','EPSG','4269','ESRI','102733',NULL,0); @@ -14969,6 +15051,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102766_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -18123,6 +18206,8 @@ INSERT INTO "extent" VALUES('ESRI','186','Bangladesh - Dinajpur','Bangladesh - D >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('ESRI','64','Colombia - Leticia - Amazonas','Colombia - Leticia - Amazonas',-4.7,-3.683333333333334,-70.45,-69.43333333333334,0); INSERT INTO "conversion" VALUES('ESRI','102767','unnamed',NULL,'EPSG','1052','Colombia Urban','EPSG','8801','Latitude of natural origin',-4.197684047222222,'EPSG','9102','EPSG','8802','Longitude of natural origin',-69.94281105833333,'EPSG','9102','EPSG','8806','False easting',25978.217,'EPSG','9001','EPSG','8807','False northing',27501.365,'EPSG','9001','EPSG','1039','Projection plane origin height',89.7,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1); INSERT INTO "usage" VALUES('ESRI', 'CONV_102767_USAGE','conversion','ESRI','102767','ESRI','64','EPSG','1024'); @@ -18876,6 +18961,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102933_USAGE','projected_crs','ESRI','1 INSERT INTO "extent" VALUES('ESRI','184','Bangladesh - Dinajpur','Bangladesh - Dinajpur',25.2166,26.6334,88.0833,89.3,0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -18898,6 +18984,8 @@ INSERT INTO "extent" VALUES('ESRI','184','Bangladesh - Dinajpur','Bangladesh - D >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "coordinate_system" VALUES('ESRI','Chain','Cartesian',2); INSERT INTO "axis" VALUES('ESRI','3','Easting','E','east','ESRI','Chain',1,'EPSG','9097'); INSERT INTO "axis" VALUES('ESRI','4','Northing','N','north','ESRI','Chain',2,'EPSG','9097'); @@ -18909,6 +18997,7 @@ INSERT INTO "conversion" VALUES('ESRI','102934','unnamed',NULL,'EPSG','9806','Ca <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -19355,6 +19444,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102950_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('ESRI', 'CONV_102934_USAGE','conversion','ESRI','102934','ESRI','184','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','102934','Cassini_Bangladesh_Zone_01_Dinajpur',NULL,'ESRI','Chain','EPSG','4042','ESRI','102934',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_102934_USAGE','projected_crs','ESRI','102934','ESRI','184','EPSG','1024'); @@ -19432,6 +19523,7 @@ INSERT INTO "projected_crs" VALUES('ESRI','102950','Cassini_Bangladesh_Zone_17_C INSERT INTO "usage" VALUES('ESRI', 'PCRS_102950_USAGE','projected_crs','ESRI','102950','ESRI','200','EPSG','1024'); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -19454,6 +19546,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102950_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('ESRI','102951','unnamed',NULL,'EPSG','9802','Lambert Conic Conformal (2SP)','EPSG','8821','Latitude of false origin',26.0,'EPSG','9102','EPSG','8822','Longitude of false origin',90.0,'EPSG','9102','EPSG','8823','Latitude of 1st standard parallel',23.15,'EPSG','9102','EPSG','8824','Latitude of 2nd standard parallel',28.8,'EPSG','9102','EPSG','8826','Easting at false origin',2743183.6991,'EPSG','9001','EPSG','8827','Northing at false origin',914395.233,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', 'CONV_102951_USAGE','conversion','ESRI','102951','EPSG','1041','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','102951','LCC_Bangladesh',NULL,'EPSG','4400','EPSG','4326','ESRI','102951',NULL,0); @@ -19473,6 +19567,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102955_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -19604,6 +19699,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102961_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('ESRI','201','Australia - Lord Howe Island - 158~E to 160~E (ISG 57/2)','Australia - Lord Howe Island - 158~E to 160~E (ISG 57/2)',-47.2,-28.15,158.0,160.0,0); INSERT INTO "conversion" VALUES('ESRI','102961','unnamed',NULL,'EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',0.0,'EPSG','9102','EPSG','8802','Longitude of natural origin',159.0,'EPSG','9102','EPSG','8805','Scale factor at natural origin',0.99994,'EPSG','9201','EPSG','8806','False easting',300000.0,'EPSG','9001','EPSG','8807','False northing',5000000.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', 'CONV_102961_USAGE','conversion','ESRI','102961','ESRI','201','EPSG','1024'); @@ -19612,6 +19709,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102961_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -19654,6 +19752,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_102961_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('ESRI','102962','unnamed',NULL,'EPSG','9822','Albers Equal Area','EPSG','8821','Latitude of false origin',0.0,'EPSG','9102','EPSG','8822','Longitude of false origin',-120.0,'EPSG','9102','EPSG','8823','Latitude of 1st standard parallel',34.0,'EPSG','9102','EPSG','8824','Latitude of 2nd standard parallel',40.5,'EPSG','9102','EPSG','8826','Easting at false origin',0.0,'EPSG','9001','EPSG','8827','Northing at false origin',-4000000.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,1); INSERT INTO "usage" VALUES('ESRI', 'CONV_102962_USAGE','conversion','ESRI','102962','EPSG','1375','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','102962','NAD_1983_2011_California_Teale_Albers',NULL,'EPSG','4400','EPSG','6318','ESRI','102962',NULL,1); @@ -21597,6 +21697,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103585_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -21843,6 +21944,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103594_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('ESRI','202','Navajo Nation','Navajo Nation',32.8,37.75,-114.04,-106.17,0); INSERT INTO "conversion" VALUES('ESRI','103586','unnamed',NULL,'EPSG','9801','Lambert Conic Conformal (1SP)','EPSG','8801','Latitude of natural origin',36.0,'EPSG','9102','EPSG','8802','Longitude of natural origin',-109.5,'EPSG','9102','EPSG','8805','Scale factor at natural origin',1.00023,'EPSG','9201','EPSG','8806','False easting',300000.0,'EPSG','9001','EPSG','8807','False northing',600000.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', 'CONV_103586_USAGE','conversion','ESRI','103586','ESRI','202','EPSG','1024'); @@ -21870,6 +21973,7 @@ INSERT INTO "projected_crs" VALUES('ESRI','103594','NAD_1983_(2011)_Navajo_Natio INSERT INTO "usage" VALUES('ESRI', 'PCRS_103594_USAGE','projected_crs','ESRI','103594','ESRI','202','EPSG','1024'); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -21892,6 +21996,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103594_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','103595','ONGD17_UTM_Zone_39N',NULL,'EPSG','4400','EPSG','9294','EPSG','16039',NULL,1); INSERT INTO "usage" VALUES('ESRI', 'PCRS_103595_USAGE','projected_crs','ESRI','103595','EPSG','4322','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','103596','ONGD17_UTM_Zone_40N',NULL,'EPSG','4400','EPSG','9294','EPSG','16040',NULL,1); @@ -22235,6 +22341,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103695_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -22366,6 +22473,8 @@ INSERT INTO "projected_crs" VALUES('ESRI','103698','NAD_1983_(CSRS)_v6_UTM_Zone_ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','103696','NAD_1983_(CSRS)_v6_UTM_Zone_19N',NULL,'EPSG','4400','EPSG','8252','EPSG','16019',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_103696_USAGE','projected_crs','ESRI','103696','EPSG','3524','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','103697','NAD_1983_(CSRS)_v6_UTM_Zone_20N',NULL,'EPSG','4400','EPSG','8252','EPSG','16020',NULL,0); @@ -22374,6 +22483,7 @@ INSERT INTO "projected_crs" VALUES('ESRI','103698','NAD_1983_(CSRS)_v6_UTM_Zone_ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -22416,6 +22526,8 @@ INSERT INTO "projected_crs" VALUES('ESRI','103698','NAD_1983_(CSRS)_v6_UTM_Zone_ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('ESRI', 'PCRS_103698_USAGE','projected_crs','ESRI','103698','EPSG','2151','EPSG','1024'); INSERT INTO "conversion" VALUES('ESRI','103699','unnamed',NULL,'EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',31.73439361111111,'EPSG','9102','EPSG','8802','Longitude of natural origin',35.20451694444445,'EPSG','9102','EPSG','8805','Scale factor at natural origin',1.0000067,'EPSG','9201','EPSG','8806','False easting',169529.584,'EPSG','9001','EPSG','8807','False northing',126907.39,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', 'CONV_103699_USAGE','conversion','ESRI','103699','EPSG','2602','EPSG','1024'); @@ -23022,6 +23134,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103872_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -23190,6 +23303,8 @@ INSERT INTO "projected_crs" VALUES('ESRI','103876','NAD_1983_(CSRS)_v6_UTM_Zone_ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','103873','NAD_1983_(CSRS)_v6_UTM_Zone_15N',NULL,'EPSG','4400','EPSG','8252','EPSG','16015',NULL,0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_103873_USAGE','projected_crs','ESRI','103873','EPSG','3414','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','103874','NAD_1983_(CSRS)_v6_UTM_Zone_16N',NULL,'EPSG','4400','EPSG','8252','EPSG','16016',NULL,0); @@ -23199,6 +23314,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103875_USAGE','projected_crs','ESRI','1 INSERT INTO "projected_crs" VALUES('ESRI','103876','NAD_1983_(CSRS)_v6_UTM_Zone_18N',NULL,'EPSG','4400','EPSG','8252','EPSG','16018',NULL,0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -23221,6 +23337,8 @@ INSERT INTO "projected_crs" VALUES('ESRI','103876','NAD_1983_(CSRS)_v6_UTM_Zone_ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('ESRI', 'PCRS_103876_USAGE','projected_crs','ESRI','103876','EPSG','3417','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','103877','Moon_2000_North_Pole_Stereographic',NULL,NULL,NULL,'ESRI','104903',NULL,NULL,'PROJCS["Moon_2000_North_Pole_Stereographic",GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Stereographic"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",90.0],UNIT["Meter",1.0]]',0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_103877_USAGE','projected_crs','ESRI','103877','EPSG','1996','EPSG','1024'); @@ -23233,6 +23351,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103878_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -23367,6 +23486,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103880_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('ESRI','203','Moon - Far Side','Moon - Far Side',-90.0,90.0,90.0,-90.0,0); INSERT INTO "projected_crs" VALUES('ESRI','103879','Moon_2000_Far_Side_Lambert_Azimuthal_Equal_Area',NULL,NULL,NULL,'ESRI','104903',NULL,NULL,'PROJCS["Moon_2000_Far_Side_Lambert_Azimuthal_Equal_Area",GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",180.0],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]',0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_103879_USAGE','projected_crs','ESRI','103879','ESRI','203','EPSG','1024'); @@ -23376,6 +23497,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103880_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -23418,6 +23540,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103880_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('ESRI','103881','Moon_2000_Equidistant_Cylindrical',NULL,NULL,NULL,'ESRI','104903',NULL,NULL,'PROJCS["Moon_2000_Equidistant_Cylindrical",GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Equidistant_Cylindrical_Ellipsoidal"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],UNIT["Meter",1.0]]',0); INSERT INTO "usage" VALUES('ESRI', 'PCRS_103881_USAGE','projected_crs','ESRI','103881','EPSG','1262','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','103882','Moon_2000_Sinusoidal',NULL,NULL,NULL,'ESRI','104903',NULL,NULL,'PROJCS["Moon_2000_Sinusoidal",GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Sinusoidal"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],UNIT["Meter",1.0]]',0); @@ -23439,6 +23563,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103887_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -23589,6 +23714,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103896_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "conversion" VALUES('ESRI','103900','unnamed',NULL,'EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',43.36666666666667,'EPSG','9102','EPSG','8802','Longitude of natural origin',-90.0,'EPSG','9102','EPSG','8805','Scale factor at natural origin',0.999999,'EPSG','9201','EPSG','8806','False easting',483000.0,'EPSG','9003','EPSG','8807','False northing',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1); INSERT INTO "usage" VALUES('ESRI', 'CONV_103900_USAGE','conversion','ESRI','103900','EPSG','1418','EPSG','1024'); INSERT INTO "projected_crs" VALUES('ESRI','103900','NAD_1983_HARN_Adj_WI_Adams_Feet',NULL,'EPSG','4497','ESRI','104800','ESRI','103900',NULL,1); @@ -23858,6 +23985,7 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_103971_USAGE','projected_crs','ESRI','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -24404,6 +24532,8 @@ INSERT INTO "usage" VALUES('ESRI', 'PCRS_112101_USAGE','projected_crs','ESRI','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "supersession" VALUES('projected_crs','ESRI','2181','projected_crs','ESRI','102550','ESRI',1); INSERT INTO "supersession" VALUES('projected_crs','ESRI','2182','projected_crs','ESRI','102551','ESRI',1); INSERT INTO "supersession" VALUES('projected_crs','ESRI','2183','projected_crs','ESRI','102552','ESRI',1); @@ -24418,6 +24548,7 @@ INSERT INTO "supersession" VALUES('projected_crs','ESRI','2187','projected_crs', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -24549,6 +24680,8 @@ INSERT INTO "supersession" VALUES('projected_crs','ESRI','31495','projected_crs' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "supersession" VALUES('projected_crs','ESRI','31917','projected_crs','EPSG','31986','ESRI',1); INSERT INTO "supersession" VALUES('projected_crs','ESRI','31918','projected_crs','EPSG','31987','ESRI',1); INSERT INTO "supersession" VALUES('projected_crs','ESRI','31919','projected_crs','EPSG','31988','ESRI',1); @@ -24654,6 +24787,7 @@ INSERT INTO "supersession" VALUES('projected_crs','ESRI','102211','projected_crs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD INSERT INTO "supersession" VALUES('projected_crs','ESRI','102212','projected_crs','ESRI','32159','ESRI',1); ======= <<<<<<< HEAD @@ -24758,6 +24892,8 @@ INSERT INTO "supersession" VALUES('projected_crs','ESRI','102212','projected_crs >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "supersession" VALUES('projected_crs','ESRI','102214','projected_crs','EPSG','4826','ESRI',1); INSERT INTO "supersession" VALUES('projected_crs','ESRI','102218','projected_crs','EPSG','9674','ESRI',1); INSERT INTO "supersession" VALUES('projected_crs','ESRI','102229','projected_crs','EPSG','2759','ESRI',1); @@ -25484,6 +25620,7 @@ INSERT INTO "supersession" VALUES('projected_crs','ESRI','103597','projected_crs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -25611,6 +25748,8 @@ INSERT INTO "supersession" VALUES('projected_crs','ESRI','103698','projected_crs >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "supersession" VALUES('projected_crs','ESRI','103794','projected_crs','EPSG','4484','ESRI',1); INSERT INTO "supersession" VALUES('projected_crs','ESRI','103795','projected_crs','EPSG','4485','ESRI',1); INSERT INTO "supersession" VALUES('projected_crs','ESRI','103796','projected_crs','EPSG','4486','ESRI',1); @@ -25624,6 +25763,7 @@ INSERT INTO "supersession" VALUES('projected_crs','ESRI','103799','projected_crs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -25754,6 +25894,8 @@ INSERT INTO "supersession" VALUES('projected_crs','ESRI','103876','projected_crs >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('vertical_datum','EPSG','1027','EGM2008_Geoid','ESRI'); INSERT INTO alias_name VALUES('vertical_datum','EPSG','1028','Fao_1979','ESRI'); INSERT INTO alias_name VALUES('vertical_datum','EPSG','1039','New_Zealand_Vertical_Datum_2009','ESRI'); @@ -25826,6 +25968,7 @@ INSERT INTO alias_name VALUES('vertical_datum','EPSG','1202','Baltic_1957','ESRI <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD INSERT INTO alias_name VALUES('vertical_datum','EPSG','1205','EPSG_example_wellbore_vertical_datum','ESRI'); ======= <<<<<<< HEAD @@ -25930,6 +26073,8 @@ INSERT INTO alias_name VALUES('vertical_datum','EPSG','1205','EPSG_example_wellb >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('vertical_datum','EPSG','1210','Macao_Height_Datum','ESRI'); INSERT INTO alias_name VALUES('vertical_datum','EPSG','1213','Helsinki_1943','ESRI'); INSERT INTO alias_name VALUES('vertical_datum','EPSG','1215','Slovenian_Vertical_System_2010','ESRI'); @@ -26316,6 +26461,7 @@ INSERT INTO alias_name VALUES('vertical_crs','EPSG','9471','INAGeoid2020_height' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -26377,6 +26523,8 @@ INSERT INTO alias_name VALUES('vertical_crs','EPSG','9650','Baltic_1986_height', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "vertical_datum" VALUES('ESRI','1296','Baltic_1986',NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '1296_USAGE','vertical_datum','ESRI','1296','EPSG','3293','EPSG','1024'); INSERT INTO "vertical_crs" VALUES('ESRI','9650','Baltic_1986_height',NULL,'EPSG','6499','ESRI','1296',0); @@ -26387,6 +26535,7 @@ INSERT INTO "usage" VALUES('ESRI', '9650_USAGE','vertical_crs','ESRI','9650','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -26486,6 +26635,8 @@ INSERT INTO alias_name VALUES('vertical_crs','EPSG','9650','Baltic_1986_height', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "vertical_datum" VALUES('ESRI','1297','European_Vertical_Reference_Frame_2007_Poland',NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '1297_USAGE','vertical_datum','ESRI','1297','EPSG','3293','EPSG','1024'); INSERT INTO "vertical_crs" VALUES('ESRI','9651','EVRF_2007_PL_height',NULL,'EPSG','6499','ESRI','1297',0); @@ -26503,6 +26654,7 @@ INSERT INTO alias_name VALUES('vertical_crs','EPSG','9681','NVD_1992_height','ES <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -26595,6 +26747,8 @@ INSERT INTO alias_name VALUES('vertical_crs','EPSG','20036','INAGeoid2020_v2_hei >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "vertical_datum" VALUES('ESRI','1306','Catania_1965',NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '1306_USAGE','vertical_datum','ESRI','1306','EPSG','2340','EPSG','1024'); INSERT INTO "vertical_crs" VALUES('ESRI','9721','Catania_1965_height',NULL,'EPSG','6499','ESRI','1306',0); @@ -26609,6 +26763,7 @@ INSERT INTO "usage" VALUES('ESRI', '9722_USAGE','vertical_crs','ESRI','9722','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -26705,6 +26860,8 @@ INSERT INTO "usage" VALUES('ESRI', '9722_USAGE','vertical_crs','ESRI','9722','EP >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "vertical_datum" VALUES('ESRI','105103','Red_Espanola_de_Nivelacion_de_Alta_Precision',NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '105103_USAGE','vertical_datum','ESRI','105103','EPSG','3429','EPSG','1024'); INSERT INTO "vertical_crs" VALUES('ESRI','105603','REDNAP_height',NULL,'EPSG','6499','ESRI','105103',0); @@ -27477,6 +27634,7 @@ INSERT INTO "usage" VALUES('ESRI', '115879_USAGE','vertical_crs','ESRI','115879' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -27627,6 +27785,8 @@ INSERT INTO "usage" VALUES('ESRI', '115885_USAGE','vertical_crs','ESRI','115885' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO alias_name VALUES('compound_crs','EPSG','3901','KKJ_Finland_Uniform_Coordinate_System_and_N60_height','ESRI'); INSERT INTO alias_name VALUES('compound_crs','EPSG','3902','ETRS_1989_TM35FIN_and_N60_height','ESRI'); INSERT INTO alias_name VALUES('compound_crs','EPSG','3903','ETRS_1989_TM35FIN_and_N2000_height','ESRI'); @@ -28990,6 +29150,7 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8550,'NAD_1983_To_N <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -29149,6 +29310,10 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8556,'NAD_1983_To_N INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8555,'NAD_1927_To_NAD_1983_7','ESRI'); INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8556,'NAD_1983_To_NAD_1983_HARN_47','ESRI'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8555,'NAD_1927_To_NAD_1983_7','ESRI'); +INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8556,'NAD_1983_To_NAD_1983_HARN_47','ESRI'); +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8561,'Old_Hawaiian_To_NAD_1983_2','ESRI'); INSERT INTO "alias_name" VALUES('concatenated_operation','EPSG',8562,'Nord_Sahara_1959_To_WGS_1984_3','ESRI'); INSERT INTO "alias_name" VALUES('concatenated_operation','EPSG',8639,'Belge_1972_To_ETRS_1989_3','ESRI'); @@ -29161,6 +29326,7 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8660,'NAD_1983_To_N <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8661,'NAD_1983_HARN_To_PA11_NADCON5_3D_Hawaii_1','ESRI'); ======= <<<<<<< HEAD @@ -29265,6 +29431,8 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8661,'NAD_1983_HARN >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8662,'American_Samoa_1962_To_NAD_1983_HARN_3','ESRI'); INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8665,'Guam_1963_To_NAD_1983_HARN_2','ESRI'); INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8668,'Puerto_Rico_To_NAD_1983_2','ESRI'); @@ -29276,6 +29444,7 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8669,'NAD_1983_To_N <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8673,'NAD_1983_NSRS2007_To_2011_NADCON5_3D_PRVI_3','ESRI'); ======= <<<<<<< HEAD @@ -29380,6 +29549,8 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8673,'NAD_1983_NSRS >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',8674,'La_Canoa_To_PSAD56_1','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',8680,'MGI_1901_To_ETRS_1989_7','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',8681,'MGI_1901_To_WGS_1984_12','ESRI'); @@ -29419,6 +29590,7 @@ INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',8853,'Maupiti_19 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -29553,6 +29725,8 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',8868,'NAD_1983_FBN_ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',8882,'Camacupa_2015_To_WGS_1984_11','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',8883,'Camacupa_To_RSAO13_1','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',8884,'Camacupa_To_RSAO13_2','ESRI'); @@ -29596,6 +29770,7 @@ INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',9144,'KOSOVAREF0 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',9181,'NAD_1983_HARN_To_HARN_Corrected_NADCON5_3D_PRVI_1','ESRI'); ======= <<<<<<< HEAD @@ -29700,6 +29875,8 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',9181,'NAD_1983_HARN >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',9185,'AGD_1966_To_GDA2020_1','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',9186,'ITRF_2008_To_IG05(2012)_Intermediate_CRS','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',9189,'WGS_1984_To_IG05(2012)_Intermediate_CRS','ESRI'); @@ -29779,6 +29956,7 @@ INSERT INTO "alias_name" VALUES('grid_transformation','EPSG',9691,'WGS_1984_To_G <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -29843,6 +30021,8 @@ INSERT INTO "usage" VALUES('ESRI', '9703_USAGE','helmert_transformation','ESRI', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('ESRI','9703','ETRF2000-PL_to_ETRS89_1',NULL,'EPSG','9603','Geocentric translations (geog2D domain)','ESRI','9702','EPSG','4258',0.0,0.0,0.0,0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '9703_USAGE','helmert_transformation','ESRI','9703','EPSG','1192','EPSG','1024'); INSERT INTO "grid_transformation" VALUES('ESRI','9740','ETRS89_to_EOS21-IRF_1',NULL,'EPSG','9615','NTv2','EPSG','4258','ESRI','9739',0.0,'EPSG','8656','Latitude and longitude difference file','uk/TN15-ETRS89-to-EOS21-IRF',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -29853,6 +30033,7 @@ INSERT INTO "usage" VALUES('ESRI', '9740_USAGE','grid_transformation','ESRI','97 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -29956,6 +30137,8 @@ INSERT INTO "usage" VALUES('ESRI', '9703_USAGE','helmert_transformation','ESRI', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('ESRI','9743','PN68_to_WGS_1984_1',NULL,'EPSG','9603','Geocentric translations (geog2D domain)','EPSG','9403','EPSG','4326',44.0,-307.0,-92.0,127.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '9743_USAGE','helmert_transformation','ESRI','9743','EPSG','3873','EPSG','1024'); INSERT INTO "helmert_transformation" VALUES('ESRI','9751','CR05_to_CR-SIRGAS_1',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','5365','EPSG','8907',0.5,-0.16959,0.35312,0.51846,'EPSG','9001',-0.03385,0.16325,-0.03446,'EPSG','9104',0.03693,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -29969,6 +30152,7 @@ INSERT INTO "usage" VALUES('ESRI', '9752_USAGE','helmert_transformation','ESRI', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -30077,6 +30261,8 @@ INSERT INTO "usage" VALUES('ESRI', '9882_USAGE','helmert_transformation','ESRI', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('ESRI','9759','ETRS89_to_ECML14_NB-IRF_1',NULL,'EPSG','9615','NTv2','EPSG','4258','ESRI','9758',0.0,'EPSG','8656','Latitude and longitude difference file','uk/TN15-ETRS89-to-ECML14_NB-IRF',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '9759_USAGE','grid_transformation','ESRI','9759','EPSG','4621','EPSG','1024'); INSERT INTO "grid_transformation" VALUES('ESRI','9764','ETRS89_to_EWR2-IRF_1',NULL,'EPSG','9615','NTv2','EPSG','4258','ESRI','9763',0.0,'EPSG','8656','Latitude and longitude difference file','uk/TN15-ETRS89-to-EWR2-IRF',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -30087,6 +30273,7 @@ INSERT INTO "usage" VALUES('ESRI', '9764_USAGE','grid_transformation','ESRI','97 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -30183,6 +30370,8 @@ INSERT INTO "usage" VALUES('ESRI', '9764_USAGE','grid_transformation','ESRI','97 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('ESRI','9898','LUREF_To_ETRS_1989_5',NULL,'EPSG','9636','Molodensky-Badekas (CF geog2D domain)','EPSG','4181','EPSG','4258',0.0,-265.8979,76.9761,20.2504,'EPSG','9001',0.43335,3.11447,-2.63637,'EPSG','9104',0.4752,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4103620.3891,440486.4152,4846923.4466,'EPSG','9001',NULL,0); INSERT INTO "usage" VALUES('ESRI', '9898_USAGE','helmert_transformation','ESRI','9898','EPSG','1146','EPSG','1024'); INSERT INTO "helmert_transformation" VALUES('ESRI','9899','LUREF_To_ETRS_1989_6',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4181','EPSG','4258',0.0,-189.033,14.1335,-43.0901,'EPSG','9001',0.43331,3.11448,-2.63636,'EPSG','9104',0.4752,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -30194,6 +30383,7 @@ INSERT INTO "usage" VALUES('ESRI', '9899_USAGE','helmert_transformation','ESRI', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -30330,6 +30520,8 @@ INSERT INTO "usage" VALUES('ESRI', '9936_USAGE','helmert_transformation','ESRI', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('ESRI','9937','LUREF_To_ETRS_1989_7',NULL,'EPSG','9636','Molodensky-Badekas (CF geog2D domain)','EPSG','4181','EPSG','4258',0.0,-265.9196,76.9506,20.2222,'EPSG','9001',0.48171,3.09948,-2.68639,'EPSG','9104',0.46346,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4101567.0943,440245.0881,4848681.4115,'EPSG','9001',NULL,0); INSERT INTO "usage" VALUES('ESRI', '9937_USAGE','helmert_transformation','ESRI','9937','EPSG','1146','EPSG','1024'); INSERT INTO "helmert_transformation" VALUES('ESRI','9938','LUREF_To_ETRS_1989_8',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4181','EPSG','4258',0.0,-189.228,12.0035,-42.6303,'EPSG','9001',0.48171,3.09948,-2.68639,'EPSG','9104',0.46346,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -30341,6 +30533,7 @@ INSERT INTO "usage" VALUES('ESRI', '9938_USAGE','helmert_transformation','ESRI', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -30485,6 +30678,8 @@ INSERT INTO "usage" VALUES('ESRI', '9999_USAGE','helmert_transformation','ESRI', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',10085,'Trinidad_1903_To_WGS_1984_2','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',10086,'Jamaica_1969_To_WGS_1972_1','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',10089,'Aratu_To_WGS_1984_5','ESRI'); @@ -30501,6 +30696,7 @@ INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',10099,'KKJ_To_WG <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -30643,6 +30839,8 @@ INSERT INTO "usage" VALUES('ESRI', '10138_USAGE','helmert_transformation','ESRI' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',15483,'Tokyo_To_JGD_2000_1','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',15484,'Tokyo_To_WGS_1984_108','ESRI'); INSERT INTO "alias_name" VALUES('helmert_transformation','EPSG',15485,'SAD_1969_To_SIRGAS_2000_1','ESRI'); @@ -30915,6 +31113,7 @@ INSERT INTO "usage" VALUES('ESRI', '108018_USAGE','helmert_transformation','ESRI <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -30986,6 +31185,8 @@ INSERT INTO "usage" VALUES('ESRI', '108021_USAGE','helmert_transformation','ESRI >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('ESRI','205','Israel, Palestine Territory, and Jordan','Israel, Palestine Territory, and Jordan',29.19,33.53,32.99,39.3,0); INSERT INTO "helmert_transformation" VALUES('ESRI','108021','WGS_1984_To_Israel_CoordFrame',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4326','EPSG','4141',1.0,-24.0024,-17.1032,-17.8444,'EPSG','9001',-0.33009,-1.85269,1.66969,'EPSG','9104',5.4248,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108021_USAGE','helmert_transformation','ESRI','108021','ESRI','205','EPSG','1024'); @@ -30997,6 +31198,7 @@ INSERT INTO "usage" VALUES('ESRI', '108022_USAGE','other_transformation','ESRI', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -31102,6 +31304,8 @@ INSERT INTO "usage" VALUES('ESRI', '108021_USAGE','helmert_transformation','ESRI >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('ESRI','108023','Datum_Lisboa_Hayford_To_WGS_1984_NTv2',NULL,'EPSG','9615','NTv2','ESRI','104106','EPSG','4326',0.1,'EPSG','8656','Latitude and longitude difference file','portugal/DLX_ETRS89_geo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108023_USAGE','grid_transformation','ESRI','108023','EPSG','1294','EPSG','1024'); INSERT INTO "grid_transformation" VALUES('ESRI','108024','Datum_Lisboa_Hayford_To_ETRS_1989_NTv2',NULL,'EPSG','9615','NTv2','ESRI','104106','EPSG','4258',0.1,'EPSG','8656','Latitude and longitude difference file','portugal/DLX_ETRS89_geo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -31155,6 +31359,7 @@ INSERT INTO "usage" VALUES('ESRI', '108047_USAGE','grid_transformation','ESRI',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -31207,6 +31412,8 @@ INSERT INTO "usage" VALUES('ESRI', '108047_USAGE','grid_transformation','ESRI',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('ESRI','108048','NAD_1983_NSRS2007_To_2011_GEOCON11_Alaska',NULL,'EPSG','9615','NTv2','EPSG','4759','EPSG','6318',0.05,'EPSG','8656','Latitude and longitude difference file','gc_nad83_2007_2011_alaska_shifts',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108048_USAGE','grid_transformation','ESRI','108048','EPSG','1330','EPSG','1024'); INSERT INTO "grid_transformation" VALUES('ESRI','108049','NAD_1983_NSRS2007_To_2011_GEOCON11_Puerto_Rico_Virgin_Islands',NULL,'EPSG','9615','NTv2','EPSG','4759','EPSG','6318',0.05,'EPSG','8656','Latitude and longitude difference file','gc_nad83_2007_2011_prvi_shifts',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -31217,6 +31424,7 @@ INSERT INTO "usage" VALUES('ESRI', '108049_USAGE','grid_transformation','ESRI',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -31313,6 +31521,8 @@ INSERT INTO "usage" VALUES('ESRI', '108049_USAGE','grid_transformation','ESRI',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('ESRI','108050','ETRS_1989_To_Xrail84_1',NULL,'EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4258','ESRI','104050',0.5,19.019,115.122,-97.287,'EPSG','9001',3.577824,-3.484437,-2.767646,'EPSG','9104',18.6084754,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108050_USAGE','helmert_transformation','ESRI','108050','ESRI','2','EPSG','1024'); INSERT INTO "helmert_transformation" VALUES('ESRI','108051','WGS_1984_To_Xrail84_1',NULL,'EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4326','ESRI','104050',0.5,19.019,115.122,-97.287,'EPSG','9001',3.577824,-3.484437,-2.767646,'EPSG','9104',18.6084754,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -31346,6 +31556,7 @@ INSERT INTO "usage" VALUES('ESRI', '108063_USAGE','other_transformation','ESRI', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -31418,6 +31629,8 @@ INSERT INTO "usage" VALUES('ESRI', '108069_USAGE','grid_transformation','ESRI',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('ESRI','206','Spain - Peninsula - NTv2 grid','Spain - Peninsula - NTv2 grid',35.5555555555556,44.4444444444444,-10.1833333333333,4.15,0); INSERT INTO "grid_transformation" VALUES('ESRI','108066','ED_1950_To_ETRS_1989_NTv2_PENR2009',NULL,'EPSG','9615','NTv2','EPSG','4230','EPSG','4258',0.1,'EPSG','8656','Latitude and longitude difference file','spain/PENR2009',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108066_USAGE','grid_transformation','ESRI','108066','ESRI','206','EPSG','1024'); @@ -31428,6 +31641,7 @@ INSERT INTO "usage" VALUES('ESRI', '108067_USAGE','grid_transformation','ESRI',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -31522,6 +31736,8 @@ INSERT INTO "usage" VALUES('ESRI', '108069_USAGE','grid_transformation','ESRI',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('ESRI','108068','ED_1950_To_WGS_1984_NTv2_PENR2009',NULL,'EPSG','9615','NTv2','EPSG','4230','EPSG','4326',0.9,'EPSG','8656','Latitude and longitude difference file','spain/PENR2009',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108068_USAGE','grid_transformation','ESRI','108068','ESRI','206','EPSG','1024'); INSERT INTO "grid_transformation" VALUES('ESRI','108069','ED_1950_To_WGS_1984_NTv2_BALR2009',NULL,'EPSG','9615','NTv2','EPSG','4230','EPSG','4326',0.9,'EPSG','8656','Latitude and longitude difference file','spain/BALR2009',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -31529,6 +31745,7 @@ INSERT INTO "usage" VALUES('ESRI', '108069_USAGE','grid_transformation','ESRI',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -31571,6 +31788,8 @@ INSERT INTO "usage" VALUES('ESRI', '108069_USAGE','grid_transformation','ESRI',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('ESRI','108070','PD/83_To_WGS_1984_7PAR',NULL,'EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4746','EPSG','4326',0.5,599.4,72.4,419.2,'EPSG','9001',-0.062,-0.022,-2.723,'EPSG','9104',6.46,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108070_USAGE','helmert_transformation','ESRI','108070','EPSG','2544','EPSG','1024'); INSERT INTO "helmert_transformation" VALUES('ESRI','108071','RD/83_To_WGS_1984_7PAR',NULL,'EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4745','EPSG','4326',0.5,612.4,77.0,440.2,'EPSG','9001',-0.054,0.057,-2.797,'EPSG','9104',2.55,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -31653,6 +31872,7 @@ INSERT INTO "usage" VALUES('ESRI', '108117_USAGE','helmert_transformation','ESRI <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -31717,6 +31937,8 @@ INSERT INTO "usage" VALUES('ESRI', '108119_USAGE','grid_transformation','ESRI',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('ESRI','108118','ED_1950_To_ETRS_1989_NTv2_Baleares',NULL,'EPSG','9615','NTv2','EPSG','4230','EPSG','4258',0.5,'EPSG','8656','Latitude and longitude difference file','spain/baleares',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108118_USAGE','grid_transformation','ESRI','108118','ESRI','207','EPSG','1024'); INSERT INTO "grid_transformation" VALUES('ESRI','108119','ED_1950_To_WGS_1984_NTv2_Baleares',NULL,'EPSG','9615','NTv2','EPSG','4230','EPSG','4326',1.0,'EPSG','8656','Latitude and longitude difference file','spain/baleares',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -31727,6 +31949,7 @@ INSERT INTO "usage" VALUES('ESRI', '108119_USAGE','grid_transformation','ESRI',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -31830,6 +32053,8 @@ INSERT INTO "usage" VALUES('ESRI', '108119_USAGE','grid_transformation','ESRI',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('ESRI','108120','Datum_73_To_WGS_1984_2',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4274','EPSG','4326',1.0,-239.749,88.181,30.488,'EPSG','9001',-0.26,-0.08,-1.21,'EPSG','9104',2.23,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108120_USAGE','helmert_transformation','ESRI','108120','EPSG','1294','EPSG','1024'); INSERT INTO "helmert_transformation" VALUES('ESRI','108121','ED_1950_To_WGS_1984_PT7',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4230','EPSG','4326',NULL,-68.863,-134.888,-111.49,'EPSG','9001',0.53,0.14,-0.57,'EPSG','9104',-3.4,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -31849,6 +32074,7 @@ INSERT INTO "usage" VALUES('ESRI', '108125_USAGE','helmert_transformation','ESRI <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -31974,6 +32200,10 @@ INSERT INTO "usage" VALUES('ESRI', '108126_USAGE','grid_transformation','ESRI',' INSERT INTO "grid_transformation" VALUES('ESRI','108126','ED_1950_To_ETRS_1989_NTv2_Peninsula',NULL,'EPSG','9615','NTv2','EPSG','4230','EPSG','4258',0.5,'EPSG','8656','Latitude and longitude difference file','spain/peninsula',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108126_USAGE','grid_transformation','ESRI','108126','ESRI','206','EPSG','1024'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('ESRI','108126','ED_1950_To_ETRS_1989_NTv2_Peninsula',NULL,'EPSG','9615','NTv2','EPSG','4230','EPSG','4258',0.5,'EPSG','8656','Latitude and longitude difference file','spain/peninsula',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); +INSERT INTO "usage" VALUES('ESRI', '108126_USAGE','grid_transformation','ESRI','108126','ESRI','206','EPSG','1024'); +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('ESRI','108127','Sao_Braz_To_WGS_1984_2',NULL,'EPSG','9607','Coordinate Frame rotation (geog2D domain)','ESRI','37249','EPSG','4326',1.0,-208.719,129.685,52.092,'EPSG','9001',0.2,0.01,-0.33,'EPSG','9104',0.2,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108127_USAGE','helmert_transformation','ESRI','108127','EPSG','1345','EPSG','1024'); INSERT INTO "helmert_transformation" VALUES('ESRI','108128','CGRS_1993_To_ETRS_1989',NULL,'EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','6311','EPSG','4258',0.5,8.846,-4.394,-1.122,'EPSG','9001',-0.00237,-0.146528,0.130428,'EPSG','9104',0.783926,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -31990,6 +32220,7 @@ INSERT INTO "grid_transformation" VALUES('ESRI','108136','ED_1950_To_WGS_1984_NT <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -32112,6 +32343,9 @@ INSERT INTO "usage" VALUES('ESRI', '108136_USAGE','grid_transformation','ESRI',' ======= INSERT INTO "usage" VALUES('ESRI', '108136_USAGE','grid_transformation','ESRI','108136','ESRI','206','EPSG','1024'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "usage" VALUES('ESRI', '108136_USAGE','grid_transformation','ESRI','108136','ESRI','206','EPSG','1024'); +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('ESRI','209','Northern Marianas - Rota','Northern Marianas - Rota',14.0,14.75,145.0,146.0,0); INSERT INTO "helmert_transformation" VALUES('ESRI','108137','Guam_1963_To_HARN_Marianas_Rota',NULL,'EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4675','EPSG','4152',NULL,-96.234,-252.601,258.222,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('ESRI', '108137_USAGE','helmert_transformation','ESRI','108137','ESRI','209','EPSG','1024'); @@ -32679,6 +32913,7 @@ VALUES <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -32822,6 +33057,11 @@ VALUES -- 'uk/TN15-ETRS89-to-ECML14_NB-IRF': no mapping -- 'uk/TN15-ETRS89-to-EWR2-IRF': no mapping >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +-- 'uk/TN15-ETRS89-to-EOS21-IRF': no mapping +-- 'uk/TN15-ETRS89-to-ECML14_NB-IRF': no mapping +-- 'uk/TN15-ETRS89-to-EWR2-IRF': no mapping +>>>>>>> locationtech-main -- 'gc_nad83_harn_2007_conus_shifts': no mapping -- 'gc_nad83_harn_2007_alaska_shifts': no mapping -- 'gc_nad83_harn_2007_prvi_shifts': no mapping @@ -32833,6 +33073,7 @@ VALUES <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -32958,6 +33199,10 @@ VALUES -- 'gc_nad83_2007_2011_alaska_shifts': no mapping -- 'gc_nad83_2007_2011_prvi_shifts': no mapping >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +-- 'gc_nad83_2007_2011_alaska_shifts': no mapping +-- 'gc_nad83_2007_2011_prvi_shifts': no mapping +>>>>>>> locationtech-main -- 'uk/osgb36_xrail84': no mapping -- 'japan/tky2jgd': no mapping -- 'icegrid2004': no mapping diff --git a/data/sql/extent.sql b/data/sql/extent.sql index 0bd623c721ed..be59ddaa9f64 100644 --- a/data/sql/extent.sql +++ b/data/sql/extent.sql @@ -282,6 +282,7 @@ INSERT INTO "extent" VALUES('EPSG','1298','Europe - ETRF by country','Europe - o <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -404,6 +405,9 @@ INSERT INTO "extent" VALUES('EPSG','1299','Europe - EVRF2000','Europe - onshore ======= INSERT INTO "extent" VALUES('EPSG','1299','Europe - EVRF2000','Europe - onshore - Andorra; Austria; Belgium; Bosnia and Herzegovina; Croatia; Czechia; Denmark; Estonia; Finland; France - mainland; Germany; Gibraltar; Hungary; Italy - mainland and Sicily; Latvia; Liechtenstein; Lithuania; Luxembourg; Netherlands; Norway; Poland; Portugal - mainland; Romania; San Marino; Slovakia; Slovenia; Spain - mainland; Sweden; Switzerland; United Kingdom (UK) - Great Britain mainland; Vatican City State.',35.95,71.21,-9.56,31.59,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "extent" VALUES('EPSG','1299','Europe - EVRF2000','Europe - onshore - Andorra; Austria; Belgium; Bosnia and Herzegovina; Croatia; Czechia; Denmark; Estonia; Finland; France - mainland; Germany; Gibraltar; Hungary; Italy - mainland and Sicily; Latvia; Liechtenstein; Lithuania; Luxembourg; Netherlands; Norway; Poland; Portugal - mainland; Romania; San Marino; Slovakia; Slovenia; Spain - mainland; Sweden; Switzerland; United Kingdom (UK) - Great Britain mainland; Vatican City State.',35.95,71.21,-9.56,31.59,0); +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','1300','Iran - FD58','Iran - Arwaz area and onshore Gulf coast west of 54°E, Lavan Island, offshore Balal field and South Pars blocks 2 and 3.',26.21,33.22,47.13,53.61,0); INSERT INTO "extent" VALUES('EPSG','1301','Portugal - Azores C - onshore','Portugal - central Azores onshore - Faial, Graciosa, Pico, Sao Jorge, Terceira.',38.32,39.14,-28.9,-26.97,0); INSERT INTO "extent" VALUES('EPSG','1302','Asia - Cambodia and Vietnam - mainland','Cambodia - mainland onshore; Vietnam - mainland onshore.',8.33,23.4,102.14,109.53,0); @@ -463,6 +467,7 @@ INSERT INTO "extent" VALUES('EPSG','1351','Asia - Middle East - Qatar offshore a <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -585,6 +590,9 @@ INSERT INTO "extent" VALUES('EPSG','1352','Norway - onshore','Norway - onshore.' ======= INSERT INTO "extent" VALUES('EPSG','1352','Norway - onshore','Norway - onshore.',57.93,71.21,4.68,31.22,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "extent" VALUES('EPSG','1352','Norway - onshore','Norway - onshore.',57.93,71.21,4.68,31.22,0); +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','1353','France - onshore','France - onshore.',NULL,NULL,NULL,NULL,1); INSERT INTO "extent" VALUES('EPSG','1354','Europe - British Isles - UK and Ireland onshore','Ireland - onshore. United Kingdom (UK) - onshore - England; Scotland; Wales; Northern Ireland. Isle of Man.',49.81,60.9,-10.56,1.84,0); INSERT INTO "extent" VALUES('EPSG','1355','Indonesia - Sumatra','Indonesia - Sumatra.',-5.99,5.97,95.16,106.13,0); @@ -980,6 +988,7 @@ INSERT INTO "extent" VALUES('EPSG','1740','Kuwait - east of 48°E onshore','Kuwa <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1072,6 +1081,8 @@ INSERT INTO "extent" VALUES('EPSG','1748','Norway - zone VIII','Norway - east of >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','1741','Norway - zone I','Norway - west of 3°30''W of Oslo (7°13''22.5"E of Greenwich).',57.93,63.06,4.68,7.23,0); INSERT INTO "extent" VALUES('EPSG','1742','Norway - zone II','Norway - between 3°30''W and 1°10'' W of Oslo (7°13''22.5"E and 9°33''22.5"E of Greenwich).',57.95,63.87,7.22,9.56,0); INSERT INTO "extent" VALUES('EPSG','1743','Norway - zone III','Norway - between 1°10''W and 1°15''E of Oslo (9°33''22.5"E and 11°58''22.5"E of Greenwich).',58.84,65.76,9.55,11.98,0); @@ -1086,6 +1097,7 @@ INSERT INTO "extent" VALUES('EPSG','1748','Norway - zone VIII','Norway - east of <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1182,6 +1194,8 @@ INSERT INTO "extent" VALUES('EPSG','1748','Norway - zone VIII','Norway - east of >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','1749','Asia - Middle East - Qatar offshore and UAE west of 54°E','Qatar - offshore. United Arab Emirates (UAE) - Abu Dhabi - onshore and offshore west of 54°E.',22.76,27.05,50.55,54.01,0); INSERT INTO "extent" VALUES('EPSG','1750','UAE - east of 54°E','United Arab Emirates (UAE) onshore and offshore east of 54°E - Abu Dhabi; Dubai; Sharjah; Ajman; Fujairah; Ras Al Kaimah; Umm Al Qaiwain.',22.63,26.27,54.0,57.13,0); INSERT INTO "extent" VALUES('EPSG','1751','Peru - east of 73°W','Peru - east of 73°W, onshore.',-18.39,-2.14,-73.0,-68.67,0); @@ -1770,6 +1784,7 @@ INSERT INTO "extent" VALUES('EPSG','2329','Syria - Deir area','Syria - Deir area <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1843,6 +1858,8 @@ INSERT INTO "extent" VALUES('EPSG','2334','Norway - North Sea - offshore south o >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','2330','Europe - North Sea','Denmark - North Sea; Germany - North Sea; Netherlands - offshore; Norway - North Sea south of 62°N; United Kingdom (UKCS) - North Sea south of 62°N.',51.03,62.01,-5.05,11.14,0); INSERT INTO "extent" VALUES('EPSG','2331','Norway - offshore north of 65°N','Norway - offshore north of 65°N.',65.0,72.0,-0.5,32.02,1); INSERT INTO "extent" VALUES('EPSG','2332','Norway - offshore north of 65°N; Svalbard','Norway - offshore north of 65°N. Also Svalbard.',65.0,84.73,-3.35,38.01,0); @@ -1854,6 +1871,7 @@ INSERT INTO "extent" VALUES('EPSG','2334','Norway - North Sea - offshore south o <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1963,6 +1981,8 @@ INSERT INTO "extent" VALUES('EPSG','2334','Norway - North Sea - offshore south o >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','2335','Spain - Balearic Islands','Spain - Balearic Islands.',38.59,40.15,1.12,4.39,0); INSERT INTO "extent" VALUES('EPSG','2336','Spain - mainland except northwest','Spain - onshore mainland except northwest (north of 41°30''N and west of 4°30''W).',35.26,43.56,-7.54,3.39,0); INSERT INTO "extent" VALUES('EPSG','2337','Spain - mainland northwest','Spain - onshore mainland north of 41°30''N and west of 4°30'' W.',41.5,43.82,-9.37,-4.5,0); @@ -1979,6 +1999,7 @@ INSERT INTO "extent" VALUES('EPSG','2343','Europe - British Isles and Channel Is <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2101,6 +2122,9 @@ INSERT INTO "extent" VALUES('EPSG','2344','Europe - Finland and Norway - onshore ======= INSERT INTO "extent" VALUES('EPSG','2344','Europe - Finland and Norway - onshore','Finland and Norway - onshore.',57.93,71.21,4.68,31.59,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "extent" VALUES('EPSG','2344','Europe - Finland and Norway - onshore','Finland and Norway - onshore.',57.93,71.21,4.68,31.59,0); +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','2345','Asia - Middle East - Iraq; Israel; Jordan; Lebanon; Kuwait; Saudi Arabia; Syria','Iraq, Israel, Jordan, Lebanon, Kuwait, Saudi Arabia and Syria - onshore.',16.37,37.39,34.17,55.67,0); INSERT INTO "extent" VALUES('EPSG','2346','World - WGS72 BE to WGS 84 - by country','World. Vietnam - offshore.',-90.0,90.0,-180.0,180.0,0); INSERT INTO "extent" VALUES('EPSG','2347','Algeria - north of 31.5°N','Algeria - onshore north of 35 grads North (31°30''N).',31.5,37.14,-3.85,9.22,0); @@ -2183,6 +2207,7 @@ INSERT INTO "extent" VALUES('EPSG','2419','Central America - Belize to Costa Ric <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2305,6 +2330,9 @@ INSERT INTO "extent" VALUES('EPSG','2420','Europe - west (DMA ED50 mean)','Austr ======= INSERT INTO "extent" VALUES('EPSG','2420','Europe - west (DMA ED50 mean)','Austria; Belgium; Denmark; Finland; Faroe islands; France; Germany (west); Gibraltar; Greece; Italy; Luxembourg; Netherlands; Norway; Portugal; Spain; Sweden; Switzerland.',34.88,71.21,-9.56,31.59,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "extent" VALUES('EPSG','2420','Europe - west (DMA ED50 mean)','Austria; Belgium; Denmark; Finland; Faroe islands; France; Germany (west); Gibraltar; Greece; Italy; Luxembourg; Netherlands; Norway; Portugal; Spain; Sweden; Switzerland.',34.88,71.21,-9.56,31.59,0); +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','2421','Europe - west central (by country)','Austria; Denmark; France; Germany (west); Netherlands; Switzerland.',42.33,57.8,-4.87,17.17,0); INSERT INTO "extent" VALUES('EPSG','2422','Slovenia - Gorenjska - central','Slovenia - central Gorenjska (Upper Carniola) with part of the Kamnik or Savinja Alps.',46.14,46.45,14.01,14.61,0); INSERT INTO "extent" VALUES('EPSG','2423','Europe - FSU onshore','Armenia; Azerbaijan; Belarus; Estonia - onshore; Georgia - onshore; Kazakhstan; Kyrgyzstan; Latvia - onshore; Lithuania - onshore; Moldova; Russian Federation - onshore; Tajikistan; Turkmenistan; Ukraine - onshore; Uzbekistan.',35.14,81.91,19.57,-168.97,0); @@ -3485,6 +3513,7 @@ INSERT INTO "extent" VALUES('EPSG','3593','New Zealand - offshore','New Zealand <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3607,6 +3636,9 @@ INSERT INTO "extent" VALUES('EPSG','3594','Europe - EVRF2007','Europe - onshore ======= INSERT INTO "extent" VALUES('EPSG','3594','Europe - EVRF2007','Europe - onshore - Andorra; Austria; Belgium; Bosnia and Herzegovina; Bulgaria; Croatia; Czechia; Denmark; Estonia; Finland; France - mainland; Germany; Gibraltar, Hungary; Italy - mainland and Sicily; Latvia; Liechtenstein; Lithuania; Luxembourg; Netherlands; Norway; Poland; Portugal - mainland; Romania; San Marino; Slovakia; Slovenia; Spain - mainland; Sweden; Switzerland; United Kingdom (UK) - Great Britain mainland; Vatican City State.',35.95,71.21,-9.56,31.59,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "extent" VALUES('EPSG','3594','Europe - EVRF2007','Europe - onshore - Andorra; Austria; Belgium; Bosnia and Herzegovina; Bulgaria; Croatia; Czechia; Denmark; Estonia; Finland; France - mainland; Germany; Gibraltar, Hungary; Italy - mainland and Sicily; Latvia; Liechtenstein; Lithuania; Luxembourg; Netherlands; Norway; Poland; Portugal - mainland; Romania; San Marino; Slovakia; Slovenia; Spain - mainland; Sweden; Switzerland; United Kingdom (UK) - Great Britain mainland; Vatican City State.',35.95,71.21,-9.56,31.59,0); +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','3595','Finland - west of 19.5°E onshore nominal','Finland - nominally onshore west of 19°30''E but may be used in adjacent areas to east if a municipality chooses to use one zone over its whole extent.',60.08,60.34,19.24,19.5,0); INSERT INTO "extent" VALUES('EPSG','3596','Finland - 19.5°E to 20.5°E onshore nominal','Finland - nominally onshore between 19°30''E and 20°30''E but may be used in adjacent areas if a municipality chooses to use one zone over its whole extent.',59.92,60.48,19.5,20.5,0); INSERT INTO "extent" VALUES('EPSG','3597','Finland - 20.5°E to 21.5°E onshore nominal','Finland - nominally onshore between 20°30''E and 21°30''E but may be used in adjacent areas if a municipality chooses to use one zone over its whole extent.',59.84,69.33,20.5,21.5,0); @@ -3655,6 +3687,7 @@ INSERT INTO "extent" VALUES('EPSG','3635','Mexico - east of 90°W','Mexico east <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3727,6 +3760,8 @@ INSERT INTO "extent" VALUES('EPSG','3639','Norway - onshore - 6°E to 7°E','Nor >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','3636','Norway - onshore - west of 6°E','Norway - onshore - west of 6°E.',58.32,62.49,4.68,6.0,0); INSERT INTO "extent" VALUES('EPSG','3637','USA - 102°W to 96°W and GoM OCS','United States (USA) - between 102°W and 96°W. Iowa; Kansas; Minnesota; Nebraska; North Dakota; Oklahoma; South Dakota; Texas; Gulf of Mexico outer continental shelf (GoM OCS) west of approximately 96°W - protraction areas Corpus Christi; Port Isabel.',25.83,49.01,-102.0,-95.87,0); INSERT INTO "extent" VALUES('EPSG','3638','South America - 84°W to 78°W, S hemisphere and SIRGAS95 by country','Ecuador (mainland whole country including areas in northern hemisphere and east of 78°W), onshore and offshore. In remainder of South America, between 84°W and 78°W, southern hemisphere, onshore and offshore.',-56.45,1.45,-84.0,-75.21,0); @@ -3737,6 +3772,7 @@ INSERT INTO "extent" VALUES('EPSG','3639','Norway - onshore - 6°E to 7°E','Nor <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3844,6 +3880,8 @@ INSERT INTO "extent" VALUES('EPSG','3639','Norway - onshore - 6°E to 7°E','Nor >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','3640','USA - 96°W to 90°W and GoM OCS','United States (USA) - between 96°W and 90°W - Arkansas; Illinois; Iowa; Kansas; Louisiana; Michigan; Minnesota; Mississippi; Missouri; Nebraska; Oklahoma; Tennessee; Texas; Wisconsin; Gulf of Mexico outer continental shelf (GoM OCS) between approximately 96°W and 90°W - protraction areas East Breaks; Alaminos Canyon; Garden Banks; Keathley Canyon; Sigsbee Escarpment; Ewing Bank; Green Canyon; Walker Ridge; Amery Terrace.',25.61,49.38,-96.01,-89.86,0); INSERT INTO "extent" VALUES('EPSG','3641','USA - 90°W to 84°W and GoM OCS','United States (USA) - between 90°W and 84°W onshore and offshore - Alabama; Arkansas; Florida; Georgia; Indiana; Illinois; Kentucky; Louisiana; Michigan; Minnesota; Mississippi; Missouri; North Carolina; Ohio; Tennessee; Wisconsin; Gulf of Mexico outer continental shelf (GoM OCS) between approximately 90°W and 84°W - protraction areas Mobile; Viosca Knoll; Mississippi Canyon; Atwater Valley; Lund; Lund South; Pensacola; Destin Dome; De Soto Canyon; Lloyd Ridge; Henderson; Florida Plain; Campeche Escarpment; Apalachicola; Florida Middle Ground; The Elbow; Vernon Basin; Howell Hook; Rankin.',23.95,48.32,-90.01,-83.91,0); INSERT INTO "extent" VALUES('EPSG','3642','USA - 84°W to 78°W and GoM OCS','United States (USA) - between 84°W and 78°W onshore and offshore - Florida; Georgia; Maryland; Michigan; New York; North Carolina; Ohio; Pennsylvania; South Carolina; Tennessee; Virginia; West Virginia; Gulf of Mexico outer continental shelf (GoM OCS) east of approximately 84°W - protraction areas Gainesville; Tarpon Springs; St Petersburg; Charlotte Harbor; Pulley Ridge; Dry Tortugas; Tortugas Valley; Miami; Key West.',23.81,46.13,-84.09,-77.99,0); @@ -3858,6 +3896,7 @@ INSERT INTO "extent" VALUES('EPSG','3646','Sao Tome and Principe - onshore - Pri <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3972,6 +4011,8 @@ INSERT INTO "extent" VALUES('EPSG','3676','Norway - onshore - east of 30°E','No >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','3647','Norway - onshore - 7°E to 8°E','Norway - onshore - between 7°E and 8°E.',57.93,63.52,7.0,8.0,0); INSERT INTO "extent" VALUES('EPSG','3648','Norway - onshore - 8°E to 9°E','Norway - onshore - between 8°E and 9°E.',58.03,63.87,8.0,9.0,0); INSERT INTO "extent" VALUES('EPSG','3649','Norway - onshore - 9°E to 10°E','Norway - onshore - between 9°E and 10°E.',58.52,64.16,9.0,10.0,0); @@ -3981,6 +4022,7 @@ INSERT INTO "extent" VALUES('EPSG','3651','Norway - onshore - 11°E to 12°E','N <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4162,6 +4204,8 @@ INSERT INTO "extent" VALUES('EPSG','3676','Norway - onshore - east of 30°E','No >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','3652','USA - Michigan - SPCS - W','United States (USA) - Michigan - counties of Baraga; Dickinson; Gogebic; Houghton; Iron; Keweenaw; Marquette; Menominee; Ontonagon.',45.09,48.32,-90.42,-83.44,0); INSERT INTO "extent" VALUES('EPSG','3653','Norway - onshore - 12°E to 13°E','Norway - onshore - between 12°E and 13°E.',59.88,68.15,12.0,13.0,0); INSERT INTO "extent" VALUES('EPSG','3654','Norway - onshore - 13°E to 14°E','Norway - onshore - between 13°E and 14°E.',64.01,68.37,13.0,14.0,0); @@ -4189,6 +4233,7 @@ INSERT INTO "extent" VALUES('EPSG','3675','Paraguay - north of 22°S','Paraguay INSERT INTO "extent" VALUES('EPSG','3676','Norway - onshore - east of 30°E','Norway - onshore - east of 30°E.',69.46,70.77,30.0,31.22,0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -4211,6 +4256,8 @@ INSERT INTO "extent" VALUES('EPSG','3676','Norway - onshore - east of 30°E','No >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','3677','Portugal - Azores 30°W to 24°W','Portugal - between 30°W and 24°W - central and eastern Azores - Graciosa, Terceira, Sao Jorge, Pico, Faial; Sao Miguel and Santa Maria islands and surrounding EEZ.',33.52,42.96,-30.0,-24.0,0); INSERT INTO "extent" VALUES('EPSG','3678','Portugal - Madeira and EEZ E of 18°W','Portugal - Madeira, Porto Santo, Desertas and Selvagens islands and surrounding EEZ east of 18°W.',29.24,36.46,-18.0,-12.48,0); INSERT INTO "extent" VALUES('EPSG','3679','Portugal - Madeira island onshore','Portugal - Madeira island onshore.',32.58,32.93,-17.31,-16.66,0); @@ -4607,6 +4654,7 @@ INSERT INTO "extent" VALUES('EPSG','4065','Arctic - 81°10''N to 76°10''N, 144 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4695,6 +4743,8 @@ INSERT INTO "extent" VALUES('EPSG','4069','Norway - onshore - 24°E to 30°E','N >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','4066','Norway - onshore - 6°E to 12°E','Norway - onshore - between 6°E and 12°E.',57.93,65.76,6.0,12.0,0); INSERT INTO "extent" VALUES('EPSG','4067','Norway - onshore - 12°E to 18°E','Norway - onshore - between 12°E and 18°E.',59.88,69.68,12.0,18.01,0); INSERT INTO "extent" VALUES('EPSG','4068','Norway - onshore - 18°E to 24°E','Norway - onshore - between 18°E and 24°E.',68.04,71.08,18.0,24.01,0); @@ -4705,6 +4755,7 @@ INSERT INTO "extent" VALUES('EPSG','4069','Norway - onshore - 24°E to 30°E','N <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4801,6 +4852,8 @@ INSERT INTO "extent" VALUES('EPSG','4069','Norway - onshore - 24°E to 30°E','N >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','4070','Arctic - 81°10''N to 76°10''N, 114°W to 84°W','Arctic - between 81°10''N and 76°10''N, approximately 114°W to approximately 84°W. May be extended westwards or eastwards within the latitude limits.',76.16,81.17,-114.0,-84.0,0); INSERT INTO "extent" VALUES('EPSG','4071','Arctic - 81°10''N to 76°10''N, 84°W to 54°W','Arctic - between 81°10''N and 76°10''N, approximately 84°W to approximately 54°W. May be extended westwards or eastwards within the latitude limits.',76.16,81.17,-84.0,-54.0,0); INSERT INTO "extent" VALUES('EPSG','4072','Arctic - 81°10''N to 76°10''N, Canada east of 84°W','Arctic - between 81°10''N and 76°10''N, Canada east of approximately 84°W. May be extended westwards within the latitude limits.',76.16,81.17,-84.0,-64.78,0); @@ -5346,6 +5399,7 @@ INSERT INTO "extent" VALUES('EPSG','4608','Europe - EVRF2019','Europe - onshore <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5468,6 +5522,9 @@ INSERT INTO "extent" VALUES('EPSG','4609','Europe - ETRF EVRF2019','Europe - ons ======= INSERT INTO "extent" VALUES('EPSG','4609','Europe - ETRF EVRF2019','Europe - onshore - Andorra; Austria; Belgium; Bosnia and Herzegovina; Bulgaria; Croatia; Czechia; Denmark; Estonia; Finland; France - mainland; Germany; Gibraltar, Hungary; Italy - mainland and Sicily; Latvia; Liechtenstein; Lithuania; Luxembourg; Netherlands; North Macedonia; Norway; Poland; Portugal - mainland; Romania; San Marino; Slovakia; Slovenia; Spain - mainland; Sweden; Switzerland; United Kingdom (UK) - Great Britain mainland; Vatican City State.',35.95,71.21,-9.56,31.59,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "extent" VALUES('EPSG','4609','Europe - ETRF EVRF2019','Europe - onshore - Andorra; Austria; Belgium; Bosnia and Herzegovina; Bulgaria; Croatia; Czechia; Denmark; Estonia; Finland; France - mainland; Germany; Gibraltar, Hungary; Italy - mainland and Sicily; Latvia; Liechtenstein; Lithuania; Luxembourg; Netherlands; North Macedonia; Norway; Poland; Portugal - mainland; Romania; San Marino; Slovakia; Slovenia; Spain - mainland; Sweden; Switzerland; United Kingdom (UK) - Great Britain mainland; Vatican City State.',35.95,71.21,-9.56,31.59,0); +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','4610','Argentina - Buenos Aires city','Argentina - autonomous city of Buenos Aires.',-34.71,-34.5,-58.54,-58.29,0); INSERT INTO "extent" VALUES('EPSG','4611','Malaysia - East Malaysia - Sarawak onshore','Malaysia - East Malaysia - Sarawak onshore.',0.85,5.03,109.54,115.69,0); INSERT INTO "extent" VALUES('EPSG','4612','Canada - Newfoundland','Canada - Newfoundland - onshore.',46.56,51.68,-59.48,-52.54,0); @@ -5521,6 +5578,7 @@ INSERT INTO "extent" VALUES('EPSG','4655','UK - Manchester to Dore','United King <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5643,6 +5701,9 @@ INSERT INTO "extent" VALUES('EPSG','4656','Norway - inshore and nearshore','Norw ======= INSERT INTO "extent" VALUES('EPSG','4656','Norway - inshore and nearshore','Norway - inshore and nearshore.',57.75,71.38,4.08,31.77,0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "extent" VALUES('EPSG','4656','Norway - inshore and nearshore','Norway - inshore and nearshore.',57.75,71.38,4.08,31.77,0); +>>>>>>> locationtech-main INSERT INTO "extent" VALUES('EPSG','4657','St Martin','St Martin - onshore and offshore.',17.87,18.19,-63.66,-62.73,0); INSERT INTO "extent" VALUES('EPSG','4658','St Barthelemy','St Barthélemy - onshore and offshore.',17.64,18.32,-63.11,-62.21,0); INSERT INTO "extent" VALUES('EPSG','4659','Italy - mainland west of 16°E','Italy - mainland northwest of approximately 16°E, including San Marino and Vatican City State.',39.65,47.1,6.62,16.53,0); @@ -5670,6 +5731,7 @@ INSERT INTO "extent" VALUES('EPSG','4676','Japan - zone XII - onshore mainland', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5810,3 +5872,5 @@ INSERT INTO "extent" VALUES('EPSG','4690','UK - London to Fishguard','United Kin >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main diff --git a/data/sql/geodetic_crs.sql b/data/sql/geodetic_crs.sql index 4ee4886b206e..a59e4b7e791a 100644 --- a/data/sql/geodetic_crs.sql +++ b/data/sql/geodetic_crs.sql @@ -2187,6 +2187,7 @@ INSERT INTO "usage" VALUES('EPSG','17901','geodetic_crs','EPSG','9990','EPSG','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2301,6 +2302,8 @@ INSERT INTO "usage" VALUES('EPSG','18657','geodetic_crs','EPSG','10175','EPSG',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "geodetic_crs" VALUES('EPSG','10176','IGS20',NULL,'geocentric','EPSG','6500','EPSG','1333',NULL,0); INSERT INTO "usage" VALUES('EPSG','18627','geodetic_crs','EPSG','10176','EPSG','2830','EPSG','1027'); INSERT INTO "geodetic_crs" VALUES('EPSG','10177','IGS20',NULL,'geographic 3D','EPSG','6423','EPSG','1333',NULL,0); @@ -2314,6 +2317,7 @@ INSERT INTO "usage" VALUES('EPSG','18629','geodetic_crs','EPSG','10178','EPSG',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2464,6 +2468,8 @@ INSERT INTO "usage" VALUES('EPSG','19181','geodetic_crs','EPSG','10277','EPSG',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "geodetic_crs" VALUES('EPSG','20033','MWC18-IRF',NULL,'geographic 2D','EPSG','6422','EPSG','1324',NULL,0); INSERT INTO "usage" VALUES('EPSG','18335','geodetic_crs','EPSG','20033','EPSG','4666','EPSG','1141'); INSERT INTO "geodetic_crs" VALUES('EPSG','20039','SIRGAS-Chile 2021',NULL,'geocentric','EPSG','6500','EPSG','1327',NULL,0); diff --git a/data/sql/geodetic_datum.sql b/data/sql/geodetic_datum.sql index 146767688d9b..e6d2fca50abe 100644 --- a/data/sql/geodetic_datum.sql +++ b/data/sql/geodetic_datum.sql @@ -369,6 +369,7 @@ INSERT INTO "usage" VALUES('EPSG','18632','geodetic_datum','EPSG','1333','EPSG', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -521,6 +522,8 @@ INSERT INTO "usage" VALUES('EPSG','19180','geodetic_datum','EPSG','1352','EPSG', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "geodetic_datum" VALUES('EPSG','6001','Not specified (based on Airy 1830 ellipsoid)',NULL,'EPSG','7001','EPSG','8901',NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('EPSG','13422','geodetic_datum','EPSG','6001','EPSG','1263','EPSG','1213'); INSERT INTO "geodetic_datum" VALUES('EPSG','6002','Not specified (based on Airy Modified 1849 ellipsoid)',NULL,'EPSG','7002','EPSG','8901',NULL,NULL,NULL,NULL,0); diff --git a/data/sql/grid_transformation.sql b/data/sql/grid_transformation.sql index 8b8156947443..74a7956cabcb 100644 --- a/data/sql/grid_transformation.sql +++ b/data/sql/grid_transformation.sql @@ -43,6 +43,7 @@ INSERT INTO "usage" VALUES('EPSG','8395','grid_transformation','EPSG','1474','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -417,6 +418,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','1503','NAD83 to NAD83(HARN) (30 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','1475','NAD83 to NAD83(HARN) (2)','Accuracy 67% confidence level. Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1728.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','azhpgn.las','EPSG','8658','Longitude difference file','azhpgn.los',NULL,NULL,'NGS-Usa AZ',0); INSERT INTO "usage" VALUES('EPSG','8396','grid_transformation','EPSG','1475','EPSG','1373','EPSG','1027'); INSERT INTO "grid_transformation" VALUES('EPSG','1476','NAD83 to NAD83(HARN) (3)','Accuracy 67% confidence level. Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1739.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','cnhpgn.las','EPSG','8658','Longitude difference file','cnhpgn.los',NULL,NULL,'NGS-Usa CA n',0); @@ -476,6 +479,7 @@ INSERT INTO "usage" VALUES('EPSG','8423','grid_transformation','EPSG','1502','EP INSERT INTO "grid_transformation" VALUES('EPSG','1503','NAD83 to NAD83(HARN) (30)','Accuracy 67% confidence level. Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1740.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','wyhpgn.las','EPSG','8658','Longitude difference file','wyhpgn.los',NULL,NULL,'NGS-Usa WY',0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -498,6 +502,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','1503','NAD83 to NAD83(HARN) (30 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8424','grid_transformation','EPSG','1503','EPSG','1419','EPSG','1027'); INSERT INTO "grid_transformation" VALUES('EPSG','1506','AGD66 to GDA94 (6)','Replaced by AGD66 to GDA94 (11) (code 1803). Input expects longitudes to be positive west; EPSG GeogCRS AGD66 (code 4202) and GDA94 (code 4283) both have longitudes positive east.','EPSG','9615','NTv2','EPSG','4202','EPSG','4283',0.1,'EPSG','8656','Latitude and longitude difference file','tas_1098.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OSG-Tas 0.1m',0); INSERT INTO "usage" VALUES('EPSG','8427','grid_transformation','EPSG','1506','EPSG','1282','EPSG','1031'); @@ -510,6 +516,7 @@ INSERT INTO "usage" VALUES('EPSG','8428','grid_transformation','EPSG','1507','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -724,6 +731,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','1554','NAD83 to NAD83(HARN) (39 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','1520','NAD83 to NAD83(HARN) (31)','Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1741.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','hihpgn.las','EPSG','8658','Longitude difference file','hihpgn.los',NULL,NULL,'NGS-Usa HI',0); INSERT INTO "usage" VALUES('EPSG','8441','grid_transformation','EPSG','1520','EPSG','1334','EPSG','1027'); INSERT INTO "grid_transformation" VALUES('EPSG','1521','NAD83 to NAD83(HARN) (32)','Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1742.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','inhpgn.las','EPSG','8658','Longitude difference file','inhpgn.los',NULL,NULL,'NGS-Usa IN',0); @@ -743,6 +752,7 @@ INSERT INTO "usage" VALUES('EPSG','8474','grid_transformation','EPSG','1553','EP INSERT INTO "grid_transformation" VALUES('EPSG','1554','NAD83 to NAD83(HARN) (39)','Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1749.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','njhpgn.las','EPSG','8658','Longitude difference file','njhpgn.los',NULL,NULL,'NGS-Usa NJ',0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -765,6 +775,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','1554','NAD83 to NAD83(HARN) (39 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8475','grid_transformation','EPSG','1554','EPSG','1399','EPSG','1027'); INSERT INTO "grid_transformation" VALUES('EPSG','1559','AGD84 to GDA94 (3)','Withdrawn and replaced by AGD84 to GDA94 (4) (code 1593) due to binary file format error. Input expects longitudes to be positive west; EPSG GeogCRS AGD84 (code 4203) and GDA94 (code 4283) have longitudes positive east.','EPSG','9615','NTv2','EPSG','4203','EPSG','4283',0.1,'EPSG','8656','Latitude and longitude difference file','wa_0400.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'DOLA-Aus WA 0.1m old',1); INSERT INTO "usage" VALUES('EPSG','8480','grid_transformation','EPSG','1559','EPSG','1280','EPSG','1031'); @@ -835,6 +847,7 @@ INSERT INTO "usage" VALUES('EPSG','8624','grid_transformation','EPSG','1703','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -908,6 +921,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','1706','NAD83 to NAD83(HARN) (42 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','1704','NAD83 to NAD83(HARN) (40)','Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1708.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','arhpgn.las','EPSG','8658','Longitude difference file','arhpgn.los',NULL,NULL,'NGS-Usa AR',0); INSERT INTO "usage" VALUES('EPSG','8625','grid_transformation','EPSG','1704','EPSG','1374','EPSG','1027'); INSERT INTO "grid_transformation" VALUES('EPSG','1705','NAD83 to NAD83(HARN) (41)','Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1709.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','iahpgn.las','EPSG','8658','Longitude difference file','iahpgn.los',NULL,NULL,'NGS-Usa IA',0); @@ -919,6 +934,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','1706','NAD83 to NAD83(HARN) (42 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1028,6 +1044,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','1706','NAD83 to NAD83(HARN) (42 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8627','grid_transformation','EPSG','1706','EPSG','1392','EPSG','1027'); INSERT INTO "grid_transformation" VALUES('EPSG','1707','NAD83 to NAD83(HARN) (43)','Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 1711.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','mohpgn.las','EPSG','8658','Longitude difference file','mohpgn.los',NULL,NULL,'NGS-Usa MO',0); INSERT INTO "usage" VALUES('EPSG','8628','grid_transformation','EPSG','1707','EPSG','1394','EPSG','1027'); @@ -1150,6 +1168,7 @@ INSERT INTO "usage" VALUES('EPSG','8772','grid_transformation','EPSG','1851','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1304,6 +1323,11 @@ INSERT INTO "grid_transformation" VALUES('EPSG','3858','WGS 84 to EGM2008 height INSERT INTO "usage" VALUES('EPSG','8948','grid_transformation','EPSG','3858','EPSG','1262','EPSG','1133'); INSERT INTO "grid_transformation" VALUES('EPSG','3859','WGS 84 to EGM2008 height (2)','Replaces WGS 84 to EGM96 height (1) (CT code 15781). Grid spacing is 1 arc-minute. For a larger grid spacing (in principle less exact) see CT code 3858. For reversible alternative see CT code 9618. An executable using spherical harmonics is available.','EPSG','1025','Geographic3D to GravityRelatedHeight (EGM2008)','EPSG','4979','EPSG','3855',0.5,'EPSG','8666','Geoid (height correction) model file','Und_min1x1_egm2008_isw=82_WGS84_TideFree.gz',NULL,NULL,NULL,NULL,NULL,NULL,'NGA-World',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','3858','WGS 84 to EGM2008 height (1)','Replaces WGS 84 to EGM96 height (1) (CT code 15781). Grid spacing is 2.5 arc-minutes. For smaller spacing (in principle more exact) see CT code 3859. For reversible alternative see CT code 9704. An executable using spherical harmonics is also available.','EPSG','1025','Geographic3D to GravityRelatedHeight (EGM2008)','EPSG','4979','EPSG','3855',1.0,'EPSG','8666','Geoid (height correction) model file','Und_min2.5x2.5_egm2008_isw=82_WGS84_TideFree.gz',NULL,NULL,NULL,NULL,NULL,NULL,'NGA-World',0); +INSERT INTO "usage" VALUES('EPSG','8948','grid_transformation','EPSG','3858','EPSG','1262','EPSG','1133'); +INSERT INTO "grid_transformation" VALUES('EPSG','3859','WGS 84 to EGM2008 height (2)','Replaces WGS 84 to EGM96 height (1) (CT code 15781). Grid spacing is 1 arc-minute. For a larger grid spacing (in principle less exact) see CT code 3858. For reversible alternative see CT code 9618. An executable using spherical harmonics is available.','EPSG','1025','Geographic3D to GravityRelatedHeight (EGM2008)','EPSG','4979','EPSG','3855',0.5,'EPSG','8666','Geoid (height correction) model file','Und_min1x1_egm2008_isw=82_WGS84_TideFree.gz',NULL,NULL,NULL,NULL,NULL,NULL,'NGA-World',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','14322','grid_transformation','EPSG','3859','EPSG','1262','EPSG','1133'); INSERT INTO "grid_transformation" VALUES('EPSG','4459','NZGD2000 to NZVD2009 height (1)','Defines NZVD2009 vertical datum (datum code 1039, CRS code 4440).','EPSG','1030','Geographic3D to GravityRelatedHeight (NZgeoid)','EPSG','4959','EPSG','4440',0.1,'EPSG','8666','Geoid (height correction) model file','nzgeoid09.sid',NULL,NULL,NULL,NULL,NULL,NULL,'LINZ-NZ 2009',0); INSERT INTO "usage" VALUES('EPSG','9090','grid_transformation','EPSG','4459','EPSG','1175','EPSG','1133'); @@ -1360,6 +1384,7 @@ INSERT INTO "usage" VALUES('EPSG','9460','grid_transformation','EPSG','5526','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1514,6 +1539,11 @@ INSERT INTO "grid_transformation" VALUES('EPSG','5528','SAD69 to SIRGAS 2000 (2) INSERT INTO "usage" VALUES('EPSG','9461','grid_transformation','EPSG','5528','EPSG','3887','EPSG','1068'); INSERT INTO "grid_transformation" VALUES('EPSG','5529','SAD69(96) to SIRGAS 2000 (1)','May be used as transformation between SAD69(96) and WGS 84 - see tfm code 5543.','EPSG','9615','NTv2','EPSG','5527','EPSG','4674',0.5,'EPSG','8656','Latitude and longitude difference file','SAD96_003.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'IBGE-Bra',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','5528','SAD69 to SIRGAS 2000 (2)','For IBGE, in onshore east and south Brazil only, replaces SAD69 to SIRGAS 2000 (1) (tfm code 15485) for pre-1996 data based on the classical geodetic network. May be used as transformation between SAD69 and WGS 84 - see tfm code 5542.','EPSG','9615','NTv2','EPSG','4618','EPSG','4674',1.0,'EPSG','8656','Latitude and longitude difference file','SAD69_003.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'IBGE-Bra',0); +INSERT INTO "usage" VALUES('EPSG','9461','grid_transformation','EPSG','5528','EPSG','3887','EPSG','1068'); +INSERT INTO "grid_transformation" VALUES('EPSG','5529','SAD69(96) to SIRGAS 2000 (1)','May be used as transformation between SAD69(96) and WGS 84 - see tfm code 5543.','EPSG','9615','NTv2','EPSG','5527','EPSG','4674',0.5,'EPSG','8656','Latitude and longitude difference file','SAD96_003.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'IBGE-Bra',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9462','grid_transformation','EPSG','5529','EPSG','3887','EPSG','1067'); INSERT INTO "grid_transformation" VALUES('EPSG','5540','Corrego Alegre 1961 to WGS 84 (1)','Parameters from Corrego Alegre 1961 to SIRGAS 2000 (1) (tfm code 5525) assuming that SIRGAS 2000 and WGS 84 are equal within the accuracy of the transformation.','EPSG','9615','NTv2','EPSG','5524','EPSG','4326',2.0,'EPSG','8656','Latitude and longitude difference file','CA61_003.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Bra',0); INSERT INTO "usage" VALUES('EPSG','9463','grid_transformation','EPSG','5540','EPSG','3874','EPSG','1252'); @@ -1526,6 +1556,7 @@ INSERT INTO "usage" VALUES('EPSG','9464','grid_transformation','EPSG','5541','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1680,6 +1711,11 @@ INSERT INTO "grid_transformation" VALUES('EPSG','5542','SAD69 to WGS 84 (15)','P INSERT INTO "usage" VALUES('EPSG','9465','grid_transformation','EPSG','5542','EPSG','3887','EPSG','1252'); INSERT INTO "grid_transformation" VALUES('EPSG','5543','SAD69(96) to WGS 84 (1)','Parameters values taken from SAD69(96) to SIRGAS 2000 (1) (tfm code 5529) assuming that SIRGAS 2000 and WGS 84 are equal within the accuracy of the transformation.','EPSG','9615','NTv2','EPSG','5527','EPSG','4326',1.0,'EPSG','8656','Latitude and longitude difference file','SAD96_003.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Bra',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','5542','SAD69 to WGS 84 (15)','Parameters values taken from SAD69 to SIRGAS 2000 (2) (tfm code 5528) assuming that SIRGAS 2000 and WGS 84 are equal within the accuracy of the transformation.','EPSG','9615','NTv2','EPSG','4618','EPSG','4326',2.0,'EPSG','8656','Latitude and longitude difference file','SAD69_003.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Bra',0); +INSERT INTO "usage" VALUES('EPSG','9465','grid_transformation','EPSG','5542','EPSG','3887','EPSG','1252'); +INSERT INTO "grid_transformation" VALUES('EPSG','5543','SAD69(96) to WGS 84 (1)','Parameters values taken from SAD69(96) to SIRGAS 2000 (1) (tfm code 5529) assuming that SIRGAS 2000 and WGS 84 are equal within the accuracy of the transformation.','EPSG','9615','NTv2','EPSG','5527','EPSG','4326',1.0,'EPSG','8656','Latitude and longitude difference file','SAD96_003.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Bra',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9466','grid_transformation','EPSG','5543','EPSG','3887','EPSG','1252'); INSERT INTO "grid_transformation" VALUES('EPSG','5594','FEH2010 to FCSVR10 height (1)','','EPSG','1030','Geographic3D to GravityRelatedHeight (NZgeoid)','EPSG','5592','EPSG','5597',0.1,'EPSG','8666','Geoid (height correction) model file','fehmarn_geoid10.gri',NULL,NULL,NULL,NULL,NULL,NULL,'FEM-Dnk-Deu Feh',1); INSERT INTO "usage" VALUES('EPSG','9477','grid_transformation','EPSG','5594','EPSG','3890','EPSG','1133'); @@ -1722,6 +1758,7 @@ INSERT INTO "usage" VALUES('EPSG','9741','grid_transformation','EPSG','6713','EP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1853,6 +1890,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','6947','TM75 to WGS 84 (4)','Par >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','6740','Tokyo to JGD2011 (2)','Parameter values from Tokyo to JGD2000 (2) (tfm code 6712) as in area of applicability JGD2011 = JGD2000. NTv2 grid derived by ESRI from that supplied by GSI in application tky2jgd. See Tokyo to JGD2011 (1) (tfm code 6714) for northern Honshu area.','EPSG','9615','NTv2','EPSG','4301','EPSG','6668',0.2,'EPSG','8656','Latitude and longitude difference file','tky2jgd.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Jpn ex N Honshu',0); INSERT INTO "usage" VALUES('EPSG','9756','grid_transformation','EPSG','6740','EPSG','4194','EPSG','1142'); INSERT INTO "grid_transformation" VALUES('EPSG','6946','TM75 to ETRS89 (3)','Approximate alternative to official OS polynomial method (tfm code 1041). May be taken as approximate transformation TM75 to WGS 84 - see code 6947.','EPSG','9615','NTv2','EPSG','4300','EPSG','4258',0.41,'EPSG','8656','Latitude and longitude difference file','tm75_etrs89.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'OSI-Ire NT',0); @@ -1861,6 +1900,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','6947','TM75 to WGS 84 (4)','Par <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -1903,6 +1943,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','6947','TM75 to WGS 84 (4)','Par >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9850','grid_transformation','EPSG','6947','EPSG','1305','EPSG','1252'); INSERT INTO "grid_transformation" VALUES('EPSG','6948','RD/83 to ETRS89 (2)','Recommended by Saxony State Spatial Data and Land Survey Corporation for transformations based on official geospatial data of Saxony. Accuracy 3mm within Saxony; within the rest of RD/83 definition area results at least coincide with EPSG CT code15868.','EPSG','9615','NTv2','EPSG','4745','EPSG','4258',0.03,'EPSG','8656','Latitude and longitude difference file','NTv2_SN.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'GeoSN-Deu SN',0); INSERT INTO "usage" VALUES('EPSG','9851','grid_transformation','EPSG','6948','EPSG','2545','EPSG','1028'); @@ -2197,6 +2239,7 @@ INSERT INTO "usage" VALUES('EPSG','10976','grid_transformation','EPSG','9181','E <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2332,6 +2375,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9228','RGSPM06 to Danger 1950 h >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','9187','RGAF09 to IGN 1988 SB height (2)','Accuracy 0.05m to 0.1m. Replaces RGAF09 to IGN 1988 SB height (1), transformation code 5508. For reversible alternative to this transformation see RGAF09 to RGAF09 + IGN 1988 SB height (2) (code 9634).','EPSG','1073','Geographic3D to GravityRelatedHeight (IGN2009)','EPSG','5488','EPSG','5619',0.1,'EPSG','8666','Geoid (height correction) model file','gg10_sbv2.mnt',NULL,NULL,NULL,NULL,NULL,NULL,'IGN Glp StB',0); INSERT INTO "usage" VALUES('EPSG','14480','grid_transformation','EPSG','9187','EPSG','2891','EPSG','1133'); INSERT INTO "grid_transformation" VALUES('EPSG','9188','RGAF09 to IGN 1988 SM height (2)','Accuracy 0.05m to 0.1m. Replaces RGAF09 to IGN 1988 SM height (1), transformation code 5505. For reversible alternative to this transformation see RGAF09 to RGAF09 + IGN 1988 SM height (2) (code 9635).','EPSG','1073','Geographic3D to GravityRelatedHeight (IGN2009)','EPSG','5488','EPSG','5620',0.1,'EPSG','8666','Geoid (height correction) model file','gg10_smv2.mnt',NULL,NULL,NULL,NULL,NULL,NULL,'IGN Glp StM',0); @@ -2342,6 +2387,7 @@ reversible alternative to this transformation see RGSPM06 to RGSPM06 + Danger 19 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -2384,6 +2430,8 @@ reversible alternative to this transformation see RGSPM06 to RGSPM06 + Danger 19 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','13868','grid_transformation','EPSG','9228','EPSG','3299','EPSG','1133'); INSERT INTO "grid_transformation" VALUES('EPSG','9229','NAD83(2011) to NAVD88 height (3)','Uses Geoid18 hybrid model. Replaces 12B model. See information source for further information. For reversible alternative to this transformation see NAD83(2011) to NAD83(2011) + NAVD88 height (3) (code 9595).','EPSG','9665','Geographic3D to GravityRelatedHeight (gtx)','EPSG','6319','EPSG','5703',0.015,'EPSG','8666','Geoid (height correction) model file','g2018u0.bin',NULL,NULL,NULL,NULL,NULL,NULL,'NGS-US Conus 18',0); INSERT INTO "usage" VALUES('EPSG','14353','grid_transformation','EPSG','9229','EPSG','1323','EPSG','1132'); @@ -2408,6 +2456,7 @@ INSERT INTO "usage" VALUES('EPSG','13882','grid_transformation','EPSG','9237','E <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2530,6 +2579,9 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9238','NAD27 to NAD83(CSRS)v2 ( ======= INSERT INTO "grid_transformation" VALUES('EPSG','9238','NAD27 to NAD83(CSRS)v2 (4)','Introduced in 2011. Precision of 20 cm in area covered by the input data set and 40 cm anywhere else, with the exception of the northwest area of the province (near the border with Quebec) where the precision deteriorates to 80 cm.','EPSG','9615','NTv2','EPSG','4267','EPSG','8237',0.8,'EPSG','8656','Latitude and longitude difference file','NB2783v2.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'SNB-Can NB',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','9238','NAD27 to NAD83(CSRS)v2 (4)','Introduced in 2011. Precision of 20 cm in area covered by the input data set and 40 cm anywhere else, with the exception of the northwest area of the province (near the border with Quebec) where the precision deteriorates to 80 cm.','EPSG','9615','NTv2','EPSG','4267','EPSG','8237',0.8,'EPSG','8656','Latitude and longitude difference file','NB2783v2.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'SNB-Can NB',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','13883','grid_transformation','EPSG','9238','EPSG','1447','EPSG','1231'); INSERT INTO "grid_transformation" VALUES('EPSG','9239','NAD27 to NAD83(CSRS)v2 (1)','Uses NT method which expects longitudes positive west; EPSG GeogCRSs NAD27 (code 4267) and NAD83(CSRS) (code 4617) have longitudes positive east. Can be taken as an approximate transformation NAD27 to WGS 84 - see code 1692.','EPSG','9615','NTv2','EPSG','4267','EPSG','8237',1.5,'EPSG','8656','Latitude and longitude difference file','QUE27-98.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'SGQ-Can QC',0); INSERT INTO "usage" VALUES('EPSG','13884','grid_transformation','EPSG','9239','EPSG','1368','EPSG','1151'); @@ -2615,6 +2667,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9330','IGN72 Grande Terre to RG <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2737,6 +2790,9 @@ INSERT INTO "usage" VALUES('EPSG','13959','grid_transformation','EPSG','9330','E ======= INSERT INTO "usage" VALUES('EPSG','13959','grid_transformation','EPSG','9330','EPSG','2823','EPSG','1031'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "usage" VALUES('EPSG','13959','grid_transformation','EPSG','9330','EPSG','2823','EPSG','1031'); +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','9338','DHDN to ETRS89 (9)','Official transformation for the state of Baden-Württemberg. Used in ATKIS (Amtliches Topographisch-Kartographisches Informationssystem [Official Topographic and Cartographic Information System]).','EPSG','9615','NTv2','EPSG','4314','EPSG','4258',0.1,'EPSG','8656','Latitude and longitude difference file','BWTA2017.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'LGL-Deu BWTA2017',0); INSERT INTO "usage" VALUES('EPSG','13961','grid_transformation','EPSG','9338','EPSG','4580','EPSG','1055'); INSERT INTO "grid_transformation" VALUES('EPSG','9352','RGNC91-93 to NGNC08 height (1)','Geoid model RANC08 realizes NGNC08 height (CRS code 9351) to a precision of 2-5cm. For reversible alternative to this transformation see RGNC91-93 to RGNC91-93 + NGNC08 height (1) (code 9640).','EPSG','1073','Geographic3D to GravityRelatedHeight (IGN2009)','EPSG','4907','EPSG','9351',0.03,'EPSG','8666','Geoid (height correction) model file','Ranc08_Circe.mnt',NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl RANC08',0); @@ -2924,6 +2980,7 @@ INSERT INTO "usage" VALUES('EPSG','14455','grid_transformation','EPSG','9597','E <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3046,6 +3103,9 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9598','GR96 to GR96 + GVR2000 h ======= INSERT INTO "grid_transformation" VALUES('EPSG','9598','GR96 to GR96 + GVR2000 height (1)','Reversible alternative to GR96 to GVR2000 height (1) (code 8268). File is also available in NOAA VDatum format (ggeoid2000.gtx) and GeoTIFF format (ggeoid2000.tif). ','EPSG','1093','Geog3D to Geog2D+GravityRelatedHeight (Gravsoft)','EPSG','4909','EPSG','8349',0.1,'EPSG','8666','Geoid (height correction) model file','gr2000g.gri',NULL,NULL,NULL,NULL,'EPSG','4747','SDFE-Grl',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','9598','GR96 to GR96 + GVR2000 height (1)','Reversible alternative to GR96 to GVR2000 height (1) (code 8268). File is also available in NOAA VDatum format (ggeoid2000.gtx) and GeoTIFF format (ggeoid2000.tif). ','EPSG','1093','Geog3D to Geog2D+GravityRelatedHeight (Gravsoft)','EPSG','4909','EPSG','8349',0.1,'EPSG','8666','Geoid (height correction) model file','gr2000g.gri',NULL,NULL,NULL,NULL,'EPSG','4747','SDFE-Grl',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','15074','grid_transformation','EPSG','9598','EPSG','4461','EPSG','1270'); INSERT INTO "grid_transformation" VALUES('EPSG','9599','GR96 to GR96 + GVR2016 height (1)','Reversible alternative to GR96 to GVR2016 height (1) (code 8269). File is also available in NOAA VDatum format (ggeoid2016.gtx) and GeoTIFF format (ggeoid2016.tif).','EPSG','1093','Geog3D to Geog2D+GravityRelatedHeight (Gravsoft)','EPSG','4909','EPSG','8350',0.1,'EPSG','8666','Geoid (height correction) model file','ggeoid16.gri',NULL,NULL,NULL,NULL,'EPSG','4747','SDFE-Grl',0); INSERT INTO "usage" VALUES('EPSG','15075','grid_transformation','EPSG','9599','EPSG','4454','EPSG','1270'); @@ -3092,6 +3152,7 @@ INSERT INTO "usage" VALUES('EPSG','14449','grid_transformation','EPSG','9617','E <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3165,6 +3226,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9620','KSA-GRF17 to KSA-GRF17 + >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','9618','WGS 84 to WGS 84 + EGM2008 height (2)','Reversible alternative to WGS 84 to EGM2008 height (2) (code 3859).','EPSG','1092','Geog3D to Geog2D+GravityRelatedHeight (EGM2008)','EPSG','4979','EPSG','9518',0.5,'EPSG','8666','Geoid (height correction) model file','Und_min1x1_egm2008_isw=82_WGS84_TideFree.gz',NULL,NULL,NULL,NULL,'EPSG','4326','NGA-World',0); INSERT INTO "usage" VALUES('EPSG','15073','grid_transformation','EPSG','9618','EPSG','1262','EPSG','1270'); INSERT INTO "grid_transformation" VALUES('EPSG','9619','FEH2010 to FEH2010 + FCSVR10 height (1)','Reversible alternative to FEH2010 to FCSVR10 height (1) (code 5626).','EPSG','1093','Geog3D to Geog2D+GravityRelatedHeight (Gravsoft)','EPSG','5592','EPSG','9519',0.1,'EPSG','8666','Geoid (height correction) model file','fehmarn_geoid10.gri',NULL,NULL,NULL,NULL,'EPSG','5593','FEM-Dnk-Deu Feh',0); @@ -3176,6 +3239,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9620','KSA-GRF17 to KSA-GRF17 + <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3285,6 +3349,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9620','KSA-GRF17 to KSA-GRF17 + >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','14453','grid_transformation','EPSG','9620','EPSG','3303','EPSG','1270'); INSERT INTO "grid_transformation" VALUES('EPSG','9621','POSGAR 2007 to POSGAR 2007 + SRVN16 height (1)','Reversible alternative to POSGAR 2007 to SRVN16 height (1) (code 9256). Uses geoid model Ar16. See information source for more information.','EPSG','1093','Geog3D to Geog2D+GravityRelatedHeight (Gravsoft)','EPSG','5342','EPSG','9521',0.05,'EPSG','8666','Geoid (height correction) model file','GEOIDE-Ar16.gri',NULL,NULL,NULL,NULL,'EPSG','5340','IGN-Arg',0); INSERT INTO "usage" VALUES('EPSG','15056','grid_transformation','EPSG','9621','EPSG','4573','EPSG','1270'); @@ -3389,6 +3455,7 @@ INSERT INTO "usage" VALUES('EPSG','14967','grid_transformation','EPSG','9693','E <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3511,6 +3578,9 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9704','WGS 84 to WGS 84 + EGM20 ======= INSERT INTO "grid_transformation" VALUES('EPSG','9704','WGS 84 to WGS 84 + EGM2008 height (1)','Reversible alternative to WGS 84 to EGM2008 height (1) (code 3858).','EPSG','1092','Geog3D to Geog2D+GravityRelatedHeight (EGM2008)','EPSG','4979','EPSG','9518',1.0,'EPSG','8666','Geoid (height correction) model file','Und_min2.5x2.5_egm2008_isw=82_WGS84_TideFree.gz',NULL,NULL,NULL,NULL,'EPSG','4326','NGA-World',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','9704','WGS 84 to WGS 84 + EGM2008 height (1)','Reversible alternative to WGS 84 to EGM2008 height (1) (code 3858).','EPSG','1092','Geog3D to Geog2D+GravityRelatedHeight (EGM2008)','EPSG','4979','EPSG','9518',1.0,'EPSG','8666','Geoid (height correction) model file','Und_min2.5x2.5_egm2008_isw=82_WGS84_TideFree.gz',NULL,NULL,NULL,NULL,'EPSG','4326','NGA-World',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','15096','grid_transformation','EPSG','9704','EPSG','1262','EPSG','1270'); INSERT INTO "grid_transformation" VALUES('EPSG','9706','WGS 84 to WGS 84 + MSL height (1)','Reversible alternative to WGS 84 to MSL height (1) (code 8037). Parameter values are from WGS 84 to WGS 84 + EGM2008 height (2) (CT code 9618) assuming that the EGM2008 surface equals MSL surface within the accuracy of the transformation.','EPSG','1092','Geog3D to Geog2D+GravityRelatedHeight (EGM2008)','EPSG','4979','EPSG','9705',0.5,'EPSG','8666','Geoid (height correction) model file','Und_min1x1_egm2008_isw=82_WGS84_TideFree.gz',NULL,NULL,NULL,NULL,'EPSG','4326','IOGP-World',0); INSERT INTO "usage" VALUES('EPSG','15105','grid_transformation','EPSG','9706','EPSG','1262','EPSG','1270'); @@ -3539,6 +3609,7 @@ INSERT INTO "usage" VALUES('EPSG','15283','grid_transformation','EPSG','9730','E <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3731,6 +3802,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9740','ETRS89 to EOS21-IRF (1)' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','9732','Monte Mario to ED50 (1)','For the reverse transformation from ED50 to Monte Mario, iteration may be avoided by using an alternative grid file (35160622_47161840_E50_R40.gsb). ','EPSG','9615','NTv2','EPSG','4265','EPSG','4230',0.1,'EPSG','8656','Latitude and longitude difference file','35160622_47161840_R40_E50.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'IGM-Ita',0); INSERT INTO "usage" VALUES('EPSG','15306','grid_transformation','EPSG','9732','EPSG','4619','EPSG','1031'); INSERT INTO "grid_transformation" VALUES('EPSG','9733','Monte Mario to IGM95 (4)','For the reverse transformation from IGM95 to Monte Mario, iteration may be avoided by using an alternative grid file (35160622_47161840_F89_R40.gsb). ','EPSG','9615','NTv2','EPSG','4265','EPSG','4670',0.1,'EPSG','8656','Latitude and longitude difference file','35160622_47161840_R40_F89.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'IGM-Ita',0); @@ -3746,6 +3819,7 @@ INSERT INTO "usage" VALUES('EPSG','15336','grid_transformation','EPSG','9737','E INSERT INTO "grid_transformation" VALUES('EPSG','9740','ETRS89 to EOS21-IRF (1)','In conjunction with the EOS-TM map projection (code 9738) applied to EOS21-IRF (code 9739), emulates the EOS21 Snake projection. Applied to ETRS89 (as realized through the OSNet v2009 CORS) defines EOS21-IRF hence is errorless.','EPSG','9615','NTv2','EPSG','4258','EPSG','9739',0.0,'EPSG','8656','Latitude and longitude difference file','TN15-ETRS89-to-EOS21-IRF.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'NR-Gbr EOS21 OSNet2009',0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -3768,6 +3842,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9740','ETRS89 to EOS21-IRF (1)' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','15342','grid_transformation','EPSG','9740','EPSG','4620','EPSG','1141'); INSERT INTO "grid_transformation" VALUES('EPSG','9759','ETRS89 to ECML14_NB-IRF (1)','In conjunction with the ECML14_NB-TM map projection (code 9760) applied to ECML14_NB-IRF (code 9758), emulates the ECML14_NB Snake projection. Applied to ETRS89 (as realized through the OSNet v2009 CORS) defines ECML14_NB-IRF hence is errorless.','EPSG','9615','NTv2','EPSG','4258','EPSG','9758',0.0,'EPSG','8656','Latitude and longitude difference file','TN15-ETRS89-to-ECML14_NB-IRF.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'NR-Gbr ECML_NB OSNet2009',0); INSERT INTO "usage" VALUES('EPSG','16500','grid_transformation','EPSG','9759','EPSG','4621','EPSG','1141'); @@ -3846,6 +3922,7 @@ INSERT INTO "usage" VALUES('EPSG','17356','grid_transformation','EPSG','9941','E <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3968,6 +4045,9 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9954','ISN93 to ISH2004 height ======= INSERT INTO "grid_transformation" VALUES('EPSG','9954','ISN93 to ISH2004 height (1)','File is also available in NOAA VDatum format (Icegeoid_ISN93.gtx). For reversible alternative to this transformation see ISN93 to ISN93 + ISH2004 height (1) (CT code 9955). Replaced by Icegeoid_ISN2004 (CT code 9956).','EPSG','1047','Geographic3D to GravityRelatedHeight (Gravsoft)','EPSG','4945','EPSG','8089',0.05,'EPSG','8666','Geoid (height correction) model file','Icegeoid_ISN93.gri',NULL,NULL,NULL,NULL,NULL,NULL,'NMI-Isl',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','9954','ISN93 to ISH2004 height (1)','File is also available in NOAA VDatum format (Icegeoid_ISN93.gtx). For reversible alternative to this transformation see ISN93 to ISN93 + ISH2004 height (1) (CT code 9955). Replaced by Icegeoid_ISN2004 (CT code 9956).','EPSG','1047','Geographic3D to GravityRelatedHeight (Gravsoft)','EPSG','4945','EPSG','8089',0.05,'EPSG','8666','Geoid (height correction) model file','Icegeoid_ISN93.gri',NULL,NULL,NULL,NULL,NULL,NULL,'NMI-Isl',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','17385','grid_transformation','EPSG','9954','EPSG','4662','EPSG','1133'); INSERT INTO "grid_transformation" VALUES('EPSG','9955','ISN93 to ISN93 + ISH2004 height (1)','Reversible alternative to ISN93 to ISH2004 height (1) (code 9954). File is also available in NOAA VDatum format (Icegeoid_ISN93.gtx). Replaced by Icegeoid_ISN2004.','EPSG','1093','Geog3D to Geog2D+GravityRelatedHeight (Gravsoft)','EPSG','4945','EPSG','9948',0.05,'EPSG','8666','Geoid (height correction) model file','Icegeoid_ISN93.gri',NULL,NULL,NULL,NULL,'EPSG','4659','NMI-Isl',0); INSERT INTO "usage" VALUES('EPSG','17393','grid_transformation','EPSG','9955','EPSG','4662','EPSG','1270'); @@ -3988,6 +4068,7 @@ INSERT INTO "usage" VALUES('EPSG','17458','grid_transformation','EPSG','9965','E <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4110,6 +4191,9 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9970','ETRS89 to SCM22-IRF (1)' ======= INSERT INTO "grid_transformation" VALUES('EPSG','9970','ETRS89 to SCM22-IRF (1)','In conjunction with the SCM22-TM map projection (code 9971) applied to SCM22-IRF (code 9969), emulates the SCM22 Snake projection. Applied to ETRS89 (as realized through the OSNet v2009) defines SCM22-IRF hence is errorless. ','EPSG','9615','NTv2','EPSG','4258','EPSG','9969',0.0,'EPSG','8656','Latitude and longitude difference file','TN15-ETRS89-to-SCM22-IRF.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'NR-Gbr SCM22 OSNet2009',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','9970','ETRS89 to SCM22-IRF (1)','In conjunction with the SCM22-TM map projection (code 9971) applied to SCM22-IRF (code 9969), emulates the SCM22 Snake projection. Applied to ETRS89 (as realized through the OSNet v2009) defines SCM22-IRF hence is errorless. ','EPSG','9615','NTv2','EPSG','4258','EPSG','9969',0.0,'EPSG','8656','Latitude and longitude difference file','TN15-ETRS89-to-SCM22-IRF.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'NR-Gbr SCM22 OSNet2009',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','17453','grid_transformation','EPSG','9970','EPSG','4665','EPSG','1141'); INSERT INTO "grid_transformation" VALUES('EPSG','9975','ETRS89 to FNL22-IRF (1)','In conjunction with the FNL22-TM map projection (code 9976) applied to FNL22-IRF (code 9974), emulates the FNL22 Snake projection. Applied to ETRS89 (as realized through the OSNet v2009) defines FNL22-IRF hence is errorless. ','EPSG','9615','NTv2','EPSG','4258','EPSG','9974',0.0,'EPSG','8656','Latitude and longitude difference file','TN15-ETRS89-to-FNL22-IRF.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'NR-Gbr FNL22 OSNet2009',0); INSERT INTO "usage" VALUES('EPSG','17452','grid_transformation','EPSG','9975','EPSG','4664','EPSG','1141'); @@ -4302,6 +4386,7 @@ INSERT INTO "usage" VALUES('EPSG','11084','grid_transformation','EPSG','10083',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4424,6 +4509,9 @@ INSERT INTO "grid_transformation" VALUES('EPSG','10084','WGS 84 to EGM96 height ======= INSERT INTO "grid_transformation" VALUES('EPSG','10084','WGS 84 to EGM96 height (1)','Replaces WGS 84 to EGM84 height (1) (CT 15781). Replaced by WGS 84 to EGM2008 height (1) and (2) (CTs 3858-59). For reversible alternative see WGS 84 to WGS 84 + EGM96 height (1) (CT 9708). An executable using spherical harmonics is also available.','EPSG','9661','Geographic3D to GravityRelatedHeight (EGM)','EPSG','4979','EPSG','5773',1.0,'EPSG','8666','Geoid (height correction) model file','WW15MGH.GRD',NULL,NULL,NULL,NULL,NULL,NULL,'NGA-World',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "grid_transformation" VALUES('EPSG','10084','WGS 84 to EGM96 height (1)','Replaces WGS 84 to EGM84 height (1) (CT 15781). Replaced by WGS 84 to EGM2008 height (1) and (2) (CTs 3858-59). For reversible alternative see WGS 84 to WGS 84 + EGM96 height (1) (CT 9708). An executable using spherical harmonics is also available.','EPSG','9661','Geographic3D to GravityRelatedHeight (EGM)','EPSG','4979','EPSG','5773',1.0,'EPSG','8666','Geoid (height correction) model file','WW15MGH.GRD',NULL,NULL,NULL,NULL,NULL,NULL,'NGA-World',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','11085','grid_transformation','EPSG','10084','EPSG','1262','EPSG','1133'); INSERT INTO "grid_transformation" VALUES('EPSG','10106','ETRS89 to SVD2006 height (1)','For reversible alternative see ETRS89 to ETRS89 + SVD2006 height (1) (code 10107).','EPSG','1047','Geographic3D to GravityRelatedHeight (Gravsoft)','EPSG','4937','EPSG','20000',1.0,'EPSG','8666','Geoid (height correction) model file','arcgp-2006-sk.bin',NULL,NULL,NULL,NULL,NULL,NULL,'NMA-Sjm SV 2006',0); INSERT INTO "usage" VALUES('EPSG','17961','grid_transformation','EPSG','10106','EPSG','4058','EPSG','1133'); @@ -4472,6 +4560,7 @@ INSERT INTO "usage" VALUES('EPSG','18588','grid_transformation','EPSG','10155',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4628,6 +4717,8 @@ INSERT INTO "usage" VALUES('EPSG','19182','grid_transformation','EPSG','10278',' >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','15486','CH1903 to CH1903+ (1)','For improved accuracy (0.01m) use CHENyx06 interpolation programme FINELTRA. File CHENyx06 replaced by CHENyx06a; there is a small area at the border of the data where some more real data has been introduced. swisstopo consider the change insignificant.','EPSG','9615','NTv2','EPSG','4149','EPSG','4150',0.2,'EPSG','8656','Latitude and longitude difference file','CHENyx06a.gsb',NULL,NULL,NULL,NULL,NULL,NULL,'BfL-Che',0); INSERT INTO "usage" VALUES('EPSG','11497','grid_transformation','EPSG','15486','EPSG','1286','EPSG','1085'); INSERT INTO "grid_transformation" VALUES('EPSG','15488','RRAF 1991 to IGN 1988 MG height (1)','May be used for transformations from WGS 84 to IGN 1988 MG. Accuracy at each 0.025 deg x 0.025 degree grid node is given within the geoid model file.','EPSG','9664','Geographic3D to GravityRelatedHeight (IGN1997)','EPSG','4973','EPSG','5617',0.2,'EPSG','8666','Geoid (height correction) model file','ggg00_mg.txt',NULL,NULL,NULL,NULL,NULL,NULL,'IGN Glp MG',1); @@ -4653,6 +4744,7 @@ INSERT INTO "usage" VALUES('EPSG','11797','grid_transformation','EPSG','15786',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4829,6 +4921,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','15838','NAD83 to NAD83(HARN) (4 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "grid_transformation" VALUES('EPSG','15834','NAD83 to NAD83(HARN) (44)','Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 15835.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','nchpgn.las','EPSG','8658','Longitude difference file','nchpgn.los',NULL,NULL,'NGS-Usa NC',0); INSERT INTO "usage" VALUES('EPSG','11845','grid_transformation','EPSG','15834','EPSG','1402','EPSG','1027'); INSERT INTO "grid_transformation" VALUES('EPSG','15835','NAD83 to WGS 84 (55)','Parameter files are from NAD83 to NAD83(HARN) (44) (code 15834) assuming that NAD83(HARN) is equivalent to WGS 84 within the accuracy of the transformation.','EPSG','9613','NADCON','EPSG','4269','EPSG','4326',2.0,'EPSG','8657','Latitude difference file','nchpgn.las','EPSG','8658','Longitude difference file','nchpgn.los',NULL,NULL,'OGP-Usa NC',0); @@ -4840,6 +4934,7 @@ INSERT INTO "usage" VALUES('EPSG','11848','grid_transformation','EPSG','15837',' INSERT INTO "grid_transformation" VALUES('EPSG','15838','NAD83 to NAD83(HARN) (46)','Uses NADCON method which expects longitudes positive west; EPSG GeogCRSs NAD83 (code 4269) and NAD83(HARN) (code 4152) have longitudes positive east. May be taken as approximate transformation NAD83-WGS 84 - see code 15839.','EPSG','9613','NADCON','EPSG','4269','EPSG','4152',0.05,'EPSG','8657','Latitude difference file','pahpgn.las','EPSG','8658','Longitude difference file','pahpgn.los',NULL,NULL,'NGS-Usa PA',0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -4862,6 +4957,8 @@ INSERT INTO "grid_transformation" VALUES('EPSG','15838','NAD83 to NAD83(HARN) (4 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','11849','grid_transformation','EPSG','15838','EPSG','1407','EPSG','1027'); INSERT INTO "grid_transformation" VALUES('EPSG','15839','NAD83 to WGS 84 (57)','Parameter files are from NAD83 to NAD83(HARN) (46) (code 15838) assuming that NAD83(HARN) is equivalent to WGS 84 within the accuracy of the transformation.','EPSG','9613','NADCON','EPSG','4269','EPSG','4326',2.0,'EPSG','8657','Latitude difference file','pahpgn.las','EPSG','8658','Longitude difference file','pahpgn.los',NULL,NULL,'OGP-Usa PA',0); INSERT INTO "usage" VALUES('EPSG','11850','grid_transformation','EPSG','15839','EPSG','1407','EPSG','1252'); diff --git a/data/sql/helmert_transformation.sql b/data/sql/helmert_transformation.sql index 3df574c3fd6c..a99196e6c3a7 100644 --- a/data/sql/helmert_transformation.sql +++ b/data/sql/helmert_transformation.sql @@ -67,6 +67,7 @@ INSERT INTO "usage" VALUES('EPSG','7986','helmert_transformation','EPSG','1065', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -189,6 +190,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1066','Amersfoort to ETRS89 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','1066','Amersfoort to ETRS89 (2)','Replaced by Amersfoort to ETRS89 (4) (tfm code 15740). Dutch sources also quote an equivalent transformation using the Coordinate Frame 7-parameter method - see tfm code 1751.','EPSG','9636','Molodensky-Badekas (CF geog2D domain)','EPSG','4289','EPSG','4258',0.5,593.032,26.0,478.741,'EPSG','9001',1.9848,-1.7439,9.0587,'EPSG','9109',4.0772,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3903453.148,368135.313,5012970.306,'EPSG','9001','NCG-Nld 2000',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1066','Amersfoort to ETRS89 (2)','Replaced by Amersfoort to ETRS89 (4) (tfm code 15740). Dutch sources also quote an equivalent transformation using the Coordinate Frame 7-parameter method - see tfm code 1751.','EPSG','9636','Molodensky-Badekas (CF geog2D domain)','EPSG','4289','EPSG','4258',0.5,593.032,26.0,478.741,'EPSG','9001',1.9848,-1.7439,9.0587,'EPSG','9109',4.0772,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3903453.148,368135.313,5012970.306,'EPSG','9001','NCG-Nld 2000',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','7987','helmert_transformation','EPSG','1066','EPSG','1275','EPSG','1035'); INSERT INTO "helmert_transformation" VALUES('EPSG','1067','Minna to WGS 84 (11)','Used by Statoil for deep water blocks 210, 213, 217 and 218. Parameter values interpolated from Racal Survey geocentric translation contour charts for each of these four blocks and then meaned.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4263','EPSG','4326',8.0,-92.1,-89.9,114.9,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Stat-Nga',0); INSERT INTO "usage" VALUES('EPSG','7988','helmert_transformation','EPSG','1067','EPSG','3817','EPSG','1136'); @@ -506,6 +510,7 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1226','Schwarzeck to WGS 84 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -628,6 +633,9 @@ Beware! Source CRS uses German legal metres, transformation parameter values ar ======= Beware! Source CRS uses German legal metres, transformation parameter values are in (International) metres. See tfm code 1271 for example.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4293','EPSG','4326',35.0,616.0,97.0,-251.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'DMA-Nam',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +Beware! Source CRS uses German legal metres, transformation parameter values are in (International) metres. See tfm code 1271 for example.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4293','EPSG','4326',35.0,616.0,97.0,-251.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'DMA-Nam',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8147','helmert_transformation','EPSG','1226','EPSG','1169','EPSG','1160'); INSERT INTO "helmert_transformation" VALUES('EPSG','1227','Tananarive to WGS 84 (1)','Accuracy estimate not available.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4297','EPSG','4326',999.0,-189.0,-242.0,-91.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'DMA-Mdg',0); INSERT INTO "usage" VALUES('EPSG','8148','helmert_transformation','EPSG','1227','EPSG','1149','EPSG','1160'); @@ -696,6 +704,7 @@ INSERT INTO "usage" VALUES('EPSG','8188','helmert_transformation','EPSG','1267', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -818,6 +827,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1271','Schwarzeck to WGS 84 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','1271','Schwarzeck to WGS 84 (2)','Beware! Source CRS uses GLM, tfm param in m. Example: Schwarzeck φ=19°35''46.952"S λ=20°41''50.649"E h=1185.99m; X=5623409.386 Y=2124618.003 Z=-2125847.632 GLM; X=5623485.84m Y=2124646.89m Z=-2125876.54m; WGS 84 X=5624101.48m Y=2124748.97m Z=-2126132.35m.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4293','EPSG','4326',999.0,615.64,102.08,-255.81,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'SLI-Nam',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1271','Schwarzeck to WGS 84 (2)','Beware! Source CRS uses GLM, tfm param in m. Example: Schwarzeck φ=19°35''46.952"S λ=20°41''50.649"E h=1185.99m; X=5623409.386 Y=2124618.003 Z=-2125847.632 GLM; X=5623485.84m Y=2124646.89m Z=-2125876.54m; WGS 84 X=5624101.48m Y=2124748.97m Z=-2126132.35m.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4293','EPSG','4326',999.0,615.64,102.08,-255.81,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'SLI-Nam',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8192','helmert_transformation','EPSG','1271','EPSG','1169','EPSG','1024'); INSERT INTO "helmert_transformation" VALUES('EPSG','1272','GGRS87 to WGS 84 (1)','','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4121','EPSG','4326',1.0,-199.87,74.79,246.62,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Hel-Grc',0); INSERT INTO "usage" VALUES('EPSG','8193','helmert_transformation','EPSG','1272','EPSG','3254','EPSG','1041'); @@ -1219,6 +1231,7 @@ INSERT INTO "usage" VALUES('EPSG','8579','helmert_transformation','EPSG','1658', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1341,6 +1354,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1659','Monte Mario to ETRS89 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','1659','Monte Mario to ETRS89 (1)','May be taken as approximate transformation Monte Mario to WGS 84 - see code 1660. For more accurate transformations to explicit realizations of ETRS89 see Monte Mario to IGM95 (4) and Monte Mario to RDN2008 (5), CTs 9733 and 9734. ','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4265','EPSG','4258',4.0,-104.1,-49.1,-9.9,'EPSG','9001',0.971,-2.917,0.714,'EPSG','9104',-11.68,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGM-Ita main',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1659','Monte Mario to ETRS89 (1)','May be taken as approximate transformation Monte Mario to WGS 84 - see code 1660. For more accurate transformations to explicit realizations of ETRS89 see Monte Mario to IGM95 (4) and Monte Mario to RDN2008 (5), CTs 9733 and 9734. ','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4265','EPSG','4258',4.0,-104.1,-49.1,-9.9,'EPSG','9001',0.971,-2.917,0.714,'EPSG','9104',-11.68,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGM-Ita main',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8580','helmert_transformation','EPSG','1659','EPSG','2372','EPSG','1044'); INSERT INTO "helmert_transformation" VALUES('EPSG','1660','Monte Mario to WGS 84 (4)','Parameter values from Monte Mario to ETRS89 (1) (code 1659). Assumes ETRS89 and WGS 84 can be considered the same to within the accuracy of the transformation.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4265','EPSG','4326',4.0,-104.1,-49.1,-9.9,'EPSG','9001',0.971,-2.917,0.714,'EPSG','9104',-11.68,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Ita main',0); INSERT INTO "usage" VALUES('EPSG','8581','helmert_transformation','EPSG','1660','EPSG','2372','EPSG','1252'); @@ -1371,6 +1387,7 @@ INSERT INTO "usage" VALUES('EPSG','8592','helmert_transformation','EPSG','1671', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1493,6 +1510,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1672','Amersfoort to WGS 84 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','1672','Amersfoort to WGS 84 (2)','Parameter values from Amersfoort to ETRS89 (1) (code 1751) assuming that ETRS89 is equivalent to WGS 84 within the accuracy of the transformation. Replaces Amersfoort to WGS 84 (1) (code 1112). Replaced by Amersfoort to WGS 84 (3) (code 15934).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4326',1.0,565.04,49.91,465.84,'EPSG','9001',1.9848,-1.7439,9.0587,'EPSG','9109',4.0772,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Nld',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1672','Amersfoort to WGS 84 (2)','Parameter values from Amersfoort to ETRS89 (1) (code 1751) assuming that ETRS89 is equivalent to WGS 84 within the accuracy of the transformation. Replaces Amersfoort to WGS 84 (1) (code 1112). Replaced by Amersfoort to WGS 84 (3) (code 15934).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4326',1.0,565.04,49.91,465.84,'EPSG','9001',1.9848,-1.7439,9.0587,'EPSG','9109',4.0772,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Nld',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8593','helmert_transformation','EPSG','1672','EPSG','1275','EPSG','1252'); INSERT INTO "helmert_transformation" VALUES('EPSG','1673','DHDN to WGS 84 (1)','Parameter values from DHDN to ETRS89 (1) (code 1309) assuming that ETRS89 is equivalent to WGS 84 within the accuracy of the transformation. Replaced by DHDN to WGS 84 (2) (tfm code 1777).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4314','EPSG','4326',5.0,582.0,105.0,414.0,'EPSG','9001',-1.04,-0.35,3.08,'EPSG','9104',8.3,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Deu W',0); INSERT INTO "usage" VALUES('EPSG','8594','helmert_transformation','EPSG','1673','EPSG','2326','EPSG','1045'); @@ -1531,6 +1551,7 @@ INSERT INTO "usage" VALUES('EPSG','8622','helmert_transformation','EPSG','1701', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1653,6 +1674,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1751','Amersfoort to ETRS89 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','1751','Amersfoort to ETRS89 (1)','Replaced by Amersfoort to ETRS89 (3) (tfm code 15739). Dutch sources also quote an equivalent transformation using the Molodenski-Badekas 10-parameter method (M-B) - see tfm code 1066.','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4258',0.5,565.04,49.91,465.84,'EPSG','9001',1.9848,-1.7439,9.0587,'EPSG','9109',4.0772,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NCG-Nld 2000',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1751','Amersfoort to ETRS89 (1)','Replaced by Amersfoort to ETRS89 (3) (tfm code 15739). Dutch sources also quote an equivalent transformation using the Molodenski-Badekas 10-parameter method (M-B) - see tfm code 1066.','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4258',0.5,565.04,49.91,465.84,'EPSG','9001',1.9848,-1.7439,9.0587,'EPSG','9109',4.0772,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NCG-Nld 2000',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8672','helmert_transformation','EPSG','1751','EPSG','1275','EPSG','1035'); INSERT INTO "helmert_transformation" VALUES('EPSG','1753','CH1903 to WGS 84 (1)','Implemented in Bundesamt für Landestopografie programme GRANIT. Used from 1987 to 1997. Not recommended for current usage - replaced by CH1903 to WGS 84 (2) (code 1766).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4149','EPSG','4326',1.0,660.077,13.551,369.344,'EPSG','9001',2.484,1.783,2.939,'EPSG','9113',5.66,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BfL-CH 1',0); INSERT INTO "usage" VALUES('EPSG','8674','helmert_transformation','EPSG','1753','EPSG','1286','EPSG','1232'); @@ -1727,6 +1751,7 @@ INSERT INTO "usage" VALUES('EPSG','8717','helmert_transformation','EPSG','1796', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1849,6 +1874,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1797','Qornoq 1927 to WGS 84 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','1797','Qornoq 1927 to WGS 84 (1)','Derived at 2 stations. Accuracy 25m, 25m and 32m in X, Y and Z axes.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4194','EPSG','4326',48.0,164.0,138.0,-189.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'DMA-Grl S',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1797','Qornoq 1927 to WGS 84 (1)','Derived at 2 stations. Accuracy 25m, 25m and 32m in X, Y and Z axes.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4194','EPSG','4326',48.0,164.0,138.0,-189.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'DMA-Grl S',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8718','helmert_transformation','EPSG','1797','EPSG','3362','EPSG','1160'); INSERT INTO "helmert_transformation" VALUES('EPSG','1798','Qornoq 1927 to WGS 84 (2)','','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4194','EPSG','4326',1.0,163.511,127.533,-159.789,'EPSG','9001',0.0,0.0,0.814,'EPSG','9104',-0.6,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'KMS-Grl',0); INSERT INTO "usage" VALUES('EPSG','8719','helmert_transformation','EPSG','1798','EPSG','3362','EPSG','1153'); @@ -1990,6 +2018,7 @@ INSERT INTO "usage" VALUES('EPSG','8797','helmert_transformation','EPSG','1876', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2112,6 +2141,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1877','SAD69 to WGS 84 (14)' ======= INSERT INTO "helmert_transformation" VALUES('EPSG','1877','SAD69 to WGS 84 (14)','Derived by Brazilian Institute of Geography and Statistics (IBGE) in 1989 at Chua origin point. In use by Shell throughout Brazil. For use by Petrobras and ANP, replaced by tfm code 5882 from 1994.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4618','EPSG','4326',5.0,-66.87,4.37,-38.52,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGBE-Bra',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1877','SAD69 to WGS 84 (14)','Derived by Brazilian Institute of Geography and Statistics (IBGE) in 1989 at Chua origin point. In use by Shell throughout Brazil. For use by Petrobras and ANP, replaced by tfm code 5882 from 1994.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4618','EPSG','4326',5.0,-66.87,4.37,-38.52,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGBE-Bra',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8798','helmert_transformation','EPSG','1877','EPSG','1053','EPSG','1210'); INSERT INTO "helmert_transformation" VALUES('EPSG','1878','SWEREF99 to ETRS89 (1)','Can be taken as an approximate transformation SWEREF99 to WGS 84 - see code 1879.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4619','EPSG','4258',0.0,0.0,0.0,0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NLS-Swe',0); INSERT INTO "usage" VALUES('EPSG','8799','helmert_transformation','EPSG','1878','EPSG','1225','EPSG','1161'); @@ -2208,6 +2240,7 @@ INSERT INTO "usage" VALUES('EPSG','8847','helmert_transformation','EPSG','1926', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2362,6 +2395,11 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1927','IGN56 Lifou to WGS 84 INSERT INTO "usage" VALUES('EPSG','8848','helmert_transformation','EPSG','1927','EPSG','2814','EPSG','1041'); INSERT INTO "helmert_transformation" VALUES('EPSG','1928','IGN53 Mare to WGS 84 (1)','Withdrawn by information source and replaced by improved information - see tfm code 15901.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4641','EPSG','4326',1.0,-408.809,366.856,-412.987,'EPSG','9001',1.8842,-0.5308,2.1655,'EPSG','9104',-121.0993,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1927','IGN56 Lifou to WGS 84 (2)','Withdrawn by information source and replaced by improved information - see tfm code 15902.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4633','EPSG','4326',1.0,137.092,131.66,91.475,'EPSG','9001',-1.9436,-11.5993,-4.3321,'EPSG','9104',-7.4824,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',0); +INSERT INTO "usage" VALUES('EPSG','8848','helmert_transformation','EPSG','1927','EPSG','2814','EPSG','1041'); +INSERT INTO "helmert_transformation" VALUES('EPSG','1928','IGN53 Mare to WGS 84 (1)','Withdrawn by information source and replaced by improved information - see tfm code 15901.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4641','EPSG','4326',1.0,-408.809,366.856,-412.987,'EPSG','9001',1.8842,-0.5308,2.1655,'EPSG','9104',-121.0993,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8849','helmert_transformation','EPSG','1928','EPSG','2819','EPSG','1041'); INSERT INTO "helmert_transformation" VALUES('EPSG','1929','IGN72 Grand Terre to WGS 84 (2)','','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4634','EPSG','4326',NULL,97.295,-263.247,310.882,'EPSG','9001',-1.5999,0.8386,3.1409,'EPSG','9104',13.3259,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',1); INSERT INTO "usage" VALUES('EPSG','8850','helmert_transformation','EPSG','1929','EPSG','2822','EPSG','1041'); @@ -2412,6 +2450,7 @@ INSERT INTO "usage" VALUES('EPSG','8873','helmert_transformation','EPSG','1952', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2566,6 +2605,11 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1953','TM75 to ETRS89 (2)',' INSERT INTO "usage" VALUES('EPSG','8874','helmert_transformation','EPSG','1953','EPSG','1305','EPSG','1041'); INSERT INTO "helmert_transformation" VALUES('EPSG','1954','TM75 to WGS 84 (2)','Parameter values taken from TM65 to ETRS89 (2) (code 1953). Assumes ETRS89 and WGS 84 can be considered the same to within the accuracy of the transformation.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4300','EPSG','4326',1.0,482.5,-130.6,564.6,'EPSG','9001',-1.042,-0.214,-0.631,'EPSG','9104',8.15,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Ire',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1953','TM75 to ETRS89 (2)','TM75 is based on the geodetic datum of 1965 which should not be confused with the mapping adjustment of 1965 (TM65). May be taken as approximate transformations TM75 to WGS 84, TM65 to WGS 84 and OSNI 1952 to WGS 84 - see codes 1954, 1641 and 1955.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4300','EPSG','4258',1.0,482.5,-130.6,564.6,'EPSG','9001',-1.042,-0.214,-0.631,'EPSG','9104',8.15,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OSI-Ire',0); +INSERT INTO "usage" VALUES('EPSG','8874','helmert_transformation','EPSG','1953','EPSG','1305','EPSG','1041'); +INSERT INTO "helmert_transformation" VALUES('EPSG','1954','TM75 to WGS 84 (2)','Parameter values taken from TM65 to ETRS89 (2) (code 1953). Assumes ETRS89 and WGS 84 can be considered the same to within the accuracy of the transformation.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4300','EPSG','4326',1.0,482.5,-130.6,564.6,'EPSG','9001',-1.042,-0.214,-0.631,'EPSG','9104',8.15,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Ire',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8875','helmert_transformation','EPSG','1954','EPSG','1305','EPSG','1252'); INSERT INTO "helmert_transformation" VALUES('EPSG','1955','OSNI 1952 to WGS 84 (1)','Parameter values from TM75 to ETRS89 (2) (code 1953). Assumes each pair of (i) OSNI 1952 and TM75, and (ii) ETRS89 and WGS 84, can be considered the same to within the accuracy of the transformation.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4188','EPSG','4326',1.0,482.5,-130.6,564.6,'EPSG','9001',-1.042,-0.214,-0.631,'EPSG','9104',8.15,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Ire',0); INSERT INTO "usage" VALUES('EPSG','8876','helmert_transformation','EPSG','1955','EPSG','2530','EPSG','1252'); @@ -2590,6 +2634,7 @@ INSERT INTO "usage" VALUES('EPSG','8883','helmert_transformation','EPSG','1962', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2712,6 +2757,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1963','IGN72 Grande Terre to ======= INSERT INTO "helmert_transformation" VALUES('EPSG','1963','IGN72 Grande Terre to WGS 84 (2)','Withdrawn by information source and replaced by improved information - see tfm code 15903.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4662','EPSG','4326',1.0,97.295,-263.247,310.882,'EPSG','9001',-1.5999,0.8386,3.1409,'EPSG','9104',13.3259,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','1963','IGN72 Grande Terre to WGS 84 (2)','Withdrawn by information source and replaced by improved information - see tfm code 15903.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4662','EPSG','4326',1.0,97.295,-263.247,310.882,'EPSG','9001',-1.5999,0.8386,3.1409,'EPSG','9104',13.3259,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','8884','helmert_transformation','EPSG','1963','EPSG','2822','EPSG','1041'); INSERT INTO "helmert_transformation" VALUES('EPSG','1964','RGR92 to Reunion 1947 (1)','Note: Because of the large rotation about the Y-axis this transformation is not reversible. Errors of up to 0.5m may occur. For the reverse transformation use Piton des Neiges to RGR92 (1) (code 1926).','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4627','EPSG','4626',0.1,-789.99,627.333,89.685,'EPSG','9001',-0.6072,-76.8019,10.568,'EPSG','9104',32.2083,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGN-Reu 0.1m',0); INSERT INTO "usage" VALUES('EPSG','8885','helmert_transformation','EPSG','1964','EPSG','3337','EPSG','1031'); @@ -2842,6 +2890,7 @@ INSERT INTO "usage" VALUES('EPSG','9024','helmert_transformation','EPSG','3990', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2964,6 +3013,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','3998','Arc 1960 to WGS 84 (4 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','3998','Arc 1960 to WGS 84 (4)','Derived at 3 stations. Accuracy 20m in each axis. Info source gives source CRS as Arc 1950. From inspection of parameter values, analysis of TR8350.2 contour chart sand geographic applicability of CRS, OGP believes that the this shuld be Arc 1960.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4210','EPSG','4326',35.0,-153.0,-5.0,-292.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'DMA-Bdi',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','3998','Arc 1960 to WGS 84 (4)','Derived at 3 stations. Accuracy 20m in each axis. Info source gives source CRS as Arc 1950. From inspection of parameter values, analysis of TR8350.2 contour chart sand geographic applicability of CRS, OGP believes that the this shuld be Arc 1960.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4210','EPSG','4326',35.0,-153.0,-5.0,-292.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'DMA-Bdi',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9025','helmert_transformation','EPSG','3998','EPSG','1058','EPSG','1160'); INSERT INTO "helmert_transformation" VALUES('EPSG','4064','RGRDC 2005 to WGS 84 (1)','Approximation at the +/- 1m level assuming that RGRDC 2005 is equivalent to WGS 84 within the accuracy of the transformation.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4046','EPSG','4326',1.0,0.0,0.0,0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-DUC',0); INSERT INTO "usage" VALUES('EPSG','9027','helmert_transformation','EPSG','4064','EPSG','3613','EPSG','1252'); @@ -3026,6 +3078,7 @@ INSERT INTO "usage" VALUES('EPSG','9114','helmert_transformation','EPSG','4599', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3202,6 +3255,8 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','4831','Amersfoort to ETRS89 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('EPSG','4827','S-JTSK to ETRS89 (4)','Derived at approximately 700 points. Scale difference incorporated into rotation matrix. Replaces S-JTSK to ETRS89 (3) (code 4829) to use more common method. May be taken as approximate transformation S-JTSK to WGS 84 - see code 4836.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4156','EPSG','4258',1.0,485.0,169.5,483.8,'EPSG','9001',7.786,4.398,4.103,'EPSG','9104',0.0,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'UGKK-Svk',0); INSERT INTO "usage" VALUES('EPSG','9120','helmert_transformation','EPSG','4827','EPSG','1211','EPSG','1041'); INSERT INTO "helmert_transformation" VALUES('EPSG','4828','S-JTSK to WGS 84 (4)','Parameter values from S-JTSK to ETRS89 (4) (code 4827). Assumes ETRS89 and WGS 84 can be considered the same to within the accuracy of the transformation.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4156','EPSG','4326',1.0,485.0,169.5,483.5,'EPSG','9001',7.786,4.398,4.103,'EPSG','9104',0.0,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Svk',1); @@ -3213,6 +3268,7 @@ INSERT INTO "usage" VALUES('EPSG','9123','helmert_transformation','EPSG','4830', INSERT INTO "helmert_transformation" VALUES('EPSG','4831','Amersfoort to ETRS89 (6)','Replaces Amersfoort to ETRS89 (4) (tfm code 15740). Dutch sources also quote an equivalent transformation using the Coordinate Frame 7-parameter method - see tfm code 4830.','EPSG','9636','Molodensky-Badekas (CF geog2D domain)','EPSG','4289','EPSG','4258',0.5,593.0248,25.9984,478.7459,'EPSG','9001',1.9342,-1.6677,9.1019,'EPSG','9109',4.0725,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3903453.1482,368135.3134,5012970.3051,'EPSG','9001','NCG-Nld 2008',0); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -3235,6 +3291,8 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','4831','Amersfoort to ETRS89 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9124','helmert_transformation','EPSG','4831','EPSG','1275','EPSG','1035'); INSERT INTO "helmert_transformation" VALUES('EPSG','4832','Mexico ITRF92 to WGS 84 (1)','Approximation at the +/- 1m level assuming that Mexico ITRF92 is equivalent to WGS 84. ','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4483','EPSG','4326',1.0,0.0,0.0,0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Mex',0); @@ -3246,6 +3304,7 @@ INSERT INTO "usage" VALUES('EPSG','9125','helmert_transformation','EPSG','4832', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3368,6 +3427,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','4833','Amersfoort to WGS 84 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','4833','Amersfoort to WGS 84 (4)','Parameter values from Amersfoort to ETRS89 (5) (tfm code 4830) assuming that ETRS89 is equivalent to WGS 84 within the accuracy of the transformation. Replaces Amersfoort to WGS 84 (3) (code 15934).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4326',1.0,565.4171,50.3319,465.5524,'EPSG','9001',1.9342,-1.6677,9.1019,'EPSG','9109',4.0725,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Nld',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','4833','Amersfoort to WGS 84 (4)','Parameter values from Amersfoort to ETRS89 (5) (tfm code 4830) assuming that ETRS89 is equivalent to WGS 84 within the accuracy of the transformation. Replaces Amersfoort to WGS 84 (3) (code 15934).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4326',1.0,565.4171,50.3319,465.5524,'EPSG','9001',1.9342,-1.6677,9.1019,'EPSG','9109',4.0725,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Nld',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9126','helmert_transformation','EPSG','4833','EPSG','1275','EPSG','1252'); INSERT INTO "helmert_transformation" VALUES('EPSG','4834','Chua to WGS 84 (3)','Parameter values from Chua to SIRGAS 2000 (1) (tfm code 4069) assuming that within the tfm accuracy SIRGAS 2000 is equivalent to WGS 84.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4224','EPSG','4326',5.0,-144.35,242.88,-33.2,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Bra DF post 2000',0); INSERT INTO "usage" VALUES('EPSG','9127','helmert_transformation','EPSG','4834','EPSG','3619','EPSG','1252'); @@ -3589,6 +3651,7 @@ INSERT INTO "usage" VALUES('EPSG','9515','helmert_transformation','EPSG','5878', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3743,6 +3806,11 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','5881','SAD69(96) to SIRGAS 2 INSERT INTO "usage" VALUES('EPSG','9516','helmert_transformation','EPSG','5881','EPSG','1053','EPSG','1252'); INSERT INTO "helmert_transformation" VALUES('EPSG','5882','SAD69 to WGS 84 (16)','Parameter values taken from SAD69 to SIRGAS 2000 (1) (tfm code 15485) assuming that SIRGAS 2000 and WGS 84 are equal within the accuracy of the transformation. Used by ANP and Petrobras throughout Brazil from 1994, replacing use of tfm code 1877.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4618','EPSG','4326',5.0,-67.35,3.88,-38.22,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Bra',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','5881','SAD69(96) to SIRGAS 2000 (2)','Parameter values from SAD69 to SIRGAS 2000 (1) (tfm code 15485) assuming that SAD69 and SAD69(96) are equal within the accuracy of the transformation. Used by Petrobras and ANP throughout Brazil from 1994.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','5527','EPSG','4674',5.0,-67.35,3.88,-38.22,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IBGE-Bra',0); +INSERT INTO "usage" VALUES('EPSG','9516','helmert_transformation','EPSG','5881','EPSG','1053','EPSG','1252'); +INSERT INTO "helmert_transformation" VALUES('EPSG','5882','SAD69 to WGS 84 (16)','Parameter values taken from SAD69 to SIRGAS 2000 (1) (tfm code 15485) assuming that SIRGAS 2000 and WGS 84 are equal within the accuracy of the transformation. Used by ANP and Petrobras throughout Brazil from 1994, replacing use of tfm code 1877.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4618','EPSG','4326',5.0,-67.35,3.88,-38.22,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Bra',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9517','helmert_transformation','EPSG','5882','EPSG','1053','EPSG','1252'); INSERT INTO "helmert_transformation" VALUES('EPSG','5888','Combani 1950 to RGM04 (1)','','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4632','EPSG','4470',0.3,-599.928,-275.552,-195.665,'EPSG','9001',-0.0835,-0.4715,0.0602,'EPSG','9104',49.2814,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGN-Myt',0); INSERT INTO "usage" VALUES('EPSG','9519','helmert_transformation','EPSG','5888','EPSG','3340','EPSG','1033'); @@ -3773,6 +3841,7 @@ INSERT INTO "usage" VALUES('EPSG','9639','helmert_transformation','EPSG','6194', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3927,6 +3996,11 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','6195','SAD69(96) to WGS 84 ( INSERT INTO "usage" VALUES('EPSG','9640','helmert_transformation','EPSG','6195','EPSG','1053','EPSG','1257'); INSERT INTO "helmert_transformation" VALUES('EPSG','6196','Minna to WGS 84 (16)','Used by Addax for OPL 118 and OML 124. Derived in 1999 at 4 stations during extension into OPL 118 of control in Chevron block OML 53.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4263','EPSG','4326',5.0,-93.179,-87.124,114.338,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ADX-Nga OPL 118',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','6195','SAD69(96) to WGS 84 (2)','Parameter values from SAD69(96) to SIRGAS 2000 (2)) (tfm code 5881) assuming that SIRGAS 2000 and WGS 84 are equal within the accuracy of the transformation, based on SAD69 to SIRGAS 2000 (1)) (tfm code 15485). Used by Petrobras and ANP from 1994.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','5527','EPSG','4326',5.0,-67.35,3.88,-38.22,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Bra',0); +INSERT INTO "usage" VALUES('EPSG','9640','helmert_transformation','EPSG','6195','EPSG','1053','EPSG','1257'); +INSERT INTO "helmert_transformation" VALUES('EPSG','6196','Minna to WGS 84 (16)','Used by Addax for OPL 118 and OML 124. Derived in 1999 at 4 stations during extension into OPL 118 of control in Chevron block OML 53.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4263','EPSG','4326',5.0,-93.179,-87.124,114.338,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ADX-Nga OPL 118',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9641','helmert_transformation','EPSG','6196','EPSG','4127','EPSG','1136'); INSERT INTO "helmert_transformation" VALUES('EPSG','6205','MGI 1901 to ETRS89 (5)','Derived at 31 stations in July 2010. Residuals generally less than +/- 0.7m horizontally.','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','3906','EPSG','4258',1.0,517.4399,228.7318,579.7954,'EPSG','9001',-4.045,-4.304,15.612,'EPSG','9104',-8.312,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'KAT-Mkd',0); INSERT INTO "usage" VALUES('EPSG','9646','helmert_transformation','EPSG','6205','EPSG','1148','EPSG','1041'); @@ -4132,6 +4206,7 @@ INSERT INTO "usage" VALUES('EPSG','9873','helmert_transformation','EPSG','6976', <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4254,6 +4329,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','6977','SAD69 to WGS 84 (20)' ======= INSERT INTO "helmert_transformation" VALUES('EPSG','6977','SAD69 to WGS 84 (20)','Derived at 6 stations. Accuracy 3m, 3m and 4m in X, Y and Z axes. Also used as a transformation from SAD69 to SIRGAS-Chile - see code 6970. Unlike IGM Chile, NGA extends use of this tfm to all Chile south of 44°S.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4618','EPSG','4326',6.0,-79.0,13.0,-14.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NGA-Chile 44-',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','6977','SAD69 to WGS 84 (20)','Derived at 6 stations. Accuracy 3m, 3m and 4m in X, Y and Z axes. Also used as a transformation from SAD69 to SIRGAS-Chile - see code 6970. Unlike IGM Chile, NGA extends use of this tfm to all Chile south of 44°S.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4618','EPSG','4326',6.0,-79.0,13.0,-14.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NGA-Chile 44-',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','9874','helmert_transformation','EPSG','6977','EPSG','2805','EPSG','1160'); INSERT INTO "helmert_transformation" VALUES('EPSG','6992','IGD05 to IGD05/12','','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','7136','EPSG','7139',0.05,0.2255,-0.3709,-0.1171,'EPSG','9001',-0.00388,0.00063,-0.0182,'EPSG','9104',0.013443,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'SOI-Isr',0); INSERT INTO "usage" VALUES('EPSG','9875','helmert_transformation','EPSG','6992','EPSG','1126','EPSG','1027'); @@ -4345,6 +4423,7 @@ INSERT INTO "usage" VALUES('EPSG','10280','helmert_transformation','EPSG','7817' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4467,6 +4546,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','7833','Albanian 1987 to ETRS ======= INSERT INTO "helmert_transformation" VALUES('EPSG','7833','Albanian 1987 to ETRS89 (1)','Derived using 90 stations by IGM Italy on behalf of ASIG. mse = 18cm. Use only for horizontal coordinates; geoid heights must be calculated with ALBGEO3 software. May be taken as approximate transformation from Albanian 1987 to WGS 84 (see code 7834).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4191','EPSG','4258',0.2,-44.183,-0.58,-38.489,'EPSG','9001',-2.3867,-2.7072,3.5196,'EPSG','9104',-8.2703,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGM-Alb 2D',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','7833','Albanian 1987 to ETRS89 (1)','Derived using 90 stations by IGM Italy on behalf of ASIG. mse = 18cm. Use only for horizontal coordinates; geoid heights must be calculated with ALBGEO3 software. May be taken as approximate transformation from Albanian 1987 to WGS 84 (see code 7834).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4191','EPSG','4258',0.2,-44.183,-0.58,-38.489,'EPSG','9001',-2.3867,-2.7072,3.5196,'EPSG','9104',-8.2703,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGM-Alb 2D',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','10288','helmert_transformation','EPSG','7833','EPSG','3212','EPSG','1032'); INSERT INTO "helmert_transformation" VALUES('EPSG','7834','Albanian 1987 to WGS 84 (1)','Parameter values from Albanian 1987 to ETRS89 (1) (code 7833). Assumes ETRS89 and WGS 84 can be considered the same to within the accuracy of the transformation.','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4191','EPSG','4326',1.0,-44.183,-0.58,-38.489,'EPSG','9001',-2.3867,-2.7072,3.5196,'EPSG','9104',-8.2703,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IOGP-Alb 2D',0); INSERT INTO "usage" VALUES('EPSG','10289','helmert_transformation','EPSG','7834','EPSG','3212','EPSG','1252'); @@ -5115,6 +5197,7 @@ INSERT INTO "usage" VALUES('EPSG','11495','helmert_transformation','EPSG','15484 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5237,6 +5320,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','15485','SAD69 to SIRGAS 2000 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','15485','SAD69 to SIRGAS 2000 (1)','Accuracy generally better than 1m except in Amazon basin where it degenerates to 5m. May be used as CT between SAD69(96) and SIRGAS 2000 and between SAD69 and WGS 84 - see tfm codes 5881 and 5882. Used by Petrobras and ANP throughout Brazil from 1994.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4618','EPSG','4674',5.0,-67.35,3.88,-38.22,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IBGE-Bra',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','15485','SAD69 to SIRGAS 2000 (1)','Accuracy generally better than 1m except in Amazon basin where it degenerates to 5m. May be used as CT between SAD69(96) and SIRGAS 2000 and between SAD69 and WGS 84 - see tfm codes 5881 and 5882. Used by Petrobras and ANP throughout Brazil from 1994.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4618','EPSG','4674',5.0,-67.35,3.88,-38.22,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IBGE-Bra',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','11496','helmert_transformation','EPSG','15485','EPSG','1053','EPSG','1257'); INSERT INTO "helmert_transformation" VALUES('EPSG','15493','Minna to WGS 84 (15)','Adopted by MPN for all joint venture operations from 1/1/1996.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4263','EPSG','4326',5.0,-94.031,-83.317,116.708,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'MPN-Nga',0); INSERT INTO "usage" VALUES('EPSG','11504','helmert_transformation','EPSG','15493','EPSG','3590','EPSG','1136'); @@ -5337,6 +5423,7 @@ INSERT INTO "usage" VALUES('EPSG','11749','helmert_transformation','EPSG','15738 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5491,6 +5578,11 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','15739','Amersfoort to ETRS89 INSERT INTO "usage" VALUES('EPSG','11750','helmert_transformation','EPSG','15739','EPSG','1275','EPSG','1035'); INSERT INTO "helmert_transformation" VALUES('EPSG','15740','Amersfoort to ETRS89 (4)','Replaces Amersfoort to ETRS89 (2) (tfm code 1066). Replaced by Amersfoort to ETRS89 (6) (tfm code 4831). Dutch sources also quote an equivalent transformation using the Coordinate Frame 7-parameter method - see tfm code 15739.','EPSG','9636','Molodensky-Badekas (CF geog2D domain)','EPSG','4289','EPSG','4258',0.5,593.0297,26.0038,478.7534,'EPSG','9001',1.9725,-1.7004,9.0677,'EPSG','9109',4.0812,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3903453.1482,368135.3134,5012970.3051,'EPSG','9001','NCG-Nld 2004',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','15739','Amersfoort to ETRS89 (3)','Replaces Amersfoort to ETRS89 (1) (tfm code 1751). Replaced by Amersfoort to ETRS89 (5) (tfm code 4830). Dutch sources also quote an equivalent transformation using the Molodenski-Badekas 10-parameter method (M-B) - see tfm code 15740.','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4258',0.5,565.2369,50.0087,465.658,'EPSG','9001',1.9725,-1.7004,9.0677,'EPSG','9109',4.0812,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NCG-Nld 2004',0); +INSERT INTO "usage" VALUES('EPSG','11750','helmert_transformation','EPSG','15739','EPSG','1275','EPSG','1035'); +INSERT INTO "helmert_transformation" VALUES('EPSG','15740','Amersfoort to ETRS89 (4)','Replaces Amersfoort to ETRS89 (2) (tfm code 1066). Replaced by Amersfoort to ETRS89 (6) (tfm code 4831). Dutch sources also quote an equivalent transformation using the Coordinate Frame 7-parameter method - see tfm code 15739.','EPSG','9636','Molodensky-Badekas (CF geog2D domain)','EPSG','4289','EPSG','4258',0.5,593.0297,26.0038,478.7534,'EPSG','9001',1.9725,-1.7004,9.0677,'EPSG','9109',4.0812,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3903453.1482,368135.3134,5012970.3051,'EPSG','9001','NCG-Nld 2004',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','11751','helmert_transformation','EPSG','15740','EPSG','1275','EPSG','1035'); INSERT INTO "helmert_transformation" VALUES('EPSG','15741','Deir ez Zor to WGS 84 (2)','Derived by Elf in 1991 from tfm code 1584 concatenated with a tfm from WGS72BE to WGS84.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4227','EPSG','4326',5.0,-187.5,14.1,237.6,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Elf-Syr Deir 1991',0); INSERT INTO "usage" VALUES('EPSG','11752','helmert_transformation','EPSG','15741','EPSG','2329','EPSG','1136'); @@ -5569,6 +5661,7 @@ INSERT INTO "usage" VALUES('EPSG','11789','helmert_transformation','EPSG','15778 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5691,6 +5784,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','15779','Gulshan 303 to WGS 8 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','15779','Gulshan 303 to WGS 84 (1)','Derived at origin station in Dhaka. Source information given to 3 decimal places but rounded by OGP to be commensurate with stated accuracy.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4682','EPSG','4326',1.0,283.7,735.9,261.1,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'SB-Bgd',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','15779','Gulshan 303 to WGS 84 (1)','Derived at origin station in Dhaka. Source information given to 3 decimal places but rounded by OGP to be commensurate with stated accuracy.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4682','EPSG','4326',1.0,283.7,735.9,261.1,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'SB-Bgd',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','11790','helmert_transformation','EPSG','15779','EPSG','1041','EPSG','1136'); INSERT INTO "helmert_transformation" VALUES('EPSG','15780','POSGAR 94 to WGS 84 (1)','','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4190','EPSG','4326',1.0,0.0,0.0,0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Arg',1); INSERT INTO "usage" VALUES('EPSG','11791','helmert_transformation','EPSG','15780','EPSG','1033','EPSG','1252'); @@ -5869,6 +5965,7 @@ INSERT INTO "usage" VALUES('EPSG','11894','helmert_transformation','EPSG','15883 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5991,6 +6088,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','15884','IGN53 Mare to RGNC91 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','15884','IGN53 Mare to RGNC91-93 (1)','Determined in April 1993, modified in December 1999. May be taken as approximate transformation to WGS 84: see IGN53 Mare to WGS 84 (3) (code 15901).','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4641','EPSG','4749',2.0,287.58,177.78,-135.41,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl 1m',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','15884','IGN53 Mare to RGNC91-93 (1)','Determined in April 1993, modified in December 1999. May be taken as approximate transformation to WGS 84: see IGN53 Mare to WGS 84 (3) (code 15901).','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4641','EPSG','4749',2.0,287.58,177.78,-135.41,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl 1m',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','11895','helmert_transformation','EPSG','15884','EPSG','2819','EPSG','1042'); INSERT INTO "helmert_transformation" VALUES('EPSG','15885','ST87 Ouvea to RGNC91-93 (1)','Determined in December 1999. May be used as approximate transformation to WGS 84 - see ST87 Ouvea to WGS 84 (2) (code 15881).','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4750','EPSG','4749',0.5,-56.263,16.136,-22.856,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl 1m',0); INSERT INTO "usage" VALUES('EPSG','11896','helmert_transformation','EPSG','15885','EPSG','2813','EPSG','1035'); @@ -6029,6 +6129,7 @@ INSERT INTO "usage" VALUES('EPSG','11911','helmert_transformation','EPSG','15900 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6160,6 +6261,8 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','15903','IGN72 Grande Terre t >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "helmert_transformation" VALUES('EPSG','15901','IGN53 Mare to WGS 84 (3)','Parameter values taken from IGN53 Mare to RGNC91-93 (1) (code 15884) assuming that RGNC91-93 is equivalent to WGS 84 to within the accuracy of the transformation.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4641','EPSG','4326',2.0,287.58,177.78,-135.41,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',0); INSERT INTO "usage" VALUES('EPSG','11912','helmert_transformation','EPSG','15901','EPSG','2819','EPSG','1252'); INSERT INTO "helmert_transformation" VALUES('EPSG','15902','IGN56 Lifou to WGS 84 (3)','Parameter values taken from IGN56 Lifou to RGNC91-93 (1) (code 15883) assuming that RGNC91-93 is equivalent to WGS 84 to within the accuracy of the transformation.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4633','EPSG','4326',1.0,335.47,222.58,-230.94,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',0); @@ -6168,6 +6271,7 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','15903','IGN72 Grande Terre t <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -6210,6 +6314,8 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','15903','IGN72 Grande Terre t >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','11914','helmert_transformation','EPSG','15903','EPSG','2822','EPSG','1252'); INSERT INTO "helmert_transformation" VALUES('EPSG','15904','NEA74 Noumea to WGS 84 (2)','Parameter values taken from NEA74 Noumea to RGNC91-93 (1) (code 15886) assuming that RGNC91-93 is equivalent to WGS 84 to within the accuracy of the transformation.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4644','EPSG','4326',1.0,-10.18,-350.43,291.37,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'BGN-Ncl',0); INSERT INTO "usage" VALUES('EPSG','11915','helmert_transformation','EPSG','15904','EPSG','2823','EPSG','1252'); @@ -6259,6 +6365,7 @@ INSERT INTO "usage" VALUES('EPSG','11942','helmert_transformation','EPSG','15931 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6381,6 +6488,9 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','15934','Amersfoort to WGS 84 ======= INSERT INTO "helmert_transformation" VALUES('EPSG','15934','Amersfoort to WGS 84 (3)','Parameter values from Amersfoort to ETRS89 (3) (tfm code 15739) assuming that ETRS89 is equivalent to WGS 84 within the accuracy of the transformation. Replaces Amersfoort to WGS 84 (2) (code 1672). Replaced by Amersfoort to WGS 84 (4) (tfm code 4833).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4326',1.0,565.2369,50.0087,465.658,'EPSG','9001',1.9725,-1.7004,9.0677,'EPSG','9109',4.0812,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Nld',0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "helmert_transformation" VALUES('EPSG','15934','Amersfoort to WGS 84 (3)','Parameter values from Amersfoort to ETRS89 (3) (tfm code 15739) assuming that ETRS89 is equivalent to WGS 84 within the accuracy of the transformation. Replaces Amersfoort to WGS 84 (2) (code 1672). Replaced by Amersfoort to WGS 84 (4) (tfm code 4833).','EPSG','9607','Coordinate Frame rotation (geog2D domain)','EPSG','4289','EPSG','4326',1.0,565.2369,50.0087,465.658,'EPSG','9001',1.9725,-1.7004,9.0677,'EPSG','9109',4.0812,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'OGP-Nld',0); +>>>>>>> locationtech-main INSERT INTO "usage" VALUES('EPSG','11945','helmert_transformation','EPSG','15934','EPSG','1275','EPSG','1252'); INSERT INTO "helmert_transformation" VALUES('EPSG','15935','Beijing 1954 to WGS 84 (5)','Concatenated via WGS 72BE. Recomputation by Shelltech in 1981 of SSB 1980 observation.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4214','EPSG','4326',10.0,18.0,-136.8,-73.7,'EPSG','9001',0.0,0.0,0.814,'EPSG','9104',-0.38,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Shlt-Chn BeiBu',0); INSERT INTO "usage" VALUES('EPSG','11946','helmert_transformation','EPSG','15935','EPSG','3561','EPSG','1136'); diff --git a/data/sql/metadata.sql b/data/sql/metadata.sql index 04d44a87effc..6c43f82c37ec 100644 --- a/data/sql/metadata.sql +++ b/data/sql/metadata.sql @@ -16,6 +16,7 @@ INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MINOR', 2); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -161,6 +162,10 @@ INSERT INTO "metadata" VALUES('EPSG.DATE', '2023-01-19'); INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v10.078'); INSERT INTO "metadata" VALUES('EPSG.DATE', '2022-12-13'); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v10.078'); +INSERT INTO "metadata" VALUES('EPSG.DATE', '2022-12-13'); +>>>>>>> locationtech-main -- The value of ${PROJ_VERSION} is substituted at build time by the actual -- value. diff --git a/data/sql/projected_crs.sql b/data/sql/projected_crs.sql index 1a0ed8dbe270..e90ab8496655 100644 --- a/data/sql/projected_crs.sql +++ b/data/sql/projected_crs.sql @@ -5605,6 +5605,7 @@ INSERT INTO "usage" VALUES('EPSG','4842','projected_crs','EPSG','6621','EPSG','2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5679,6 +5680,8 @@ INSERT INTO "usage" VALUES('EPSG','4845','projected_crs','EPSG','6624','EPSG','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('EPSG','6622','NAD83(CSRS) / Quebec Lambert',NULL,'EPSG','4499','EPSG','4617','EPSG','19944',NULL,0); INSERT INTO "usage" VALUES('EPSG','4843','projected_crs','EPSG','6622','EPSG','1368','EPSG','1210'); INSERT INTO "projected_crs" VALUES('EPSG','6623','NAD83 / Quebec Albers',NULL,'EPSG','4499','EPSG','4269','EPSG','6645',NULL,0); @@ -5691,6 +5694,7 @@ INSERT INTO "usage" VALUES('EPSG','4845','projected_crs','EPSG','6624','EPSG','1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -5802,6 +5806,8 @@ INSERT INTO "usage" VALUES('EPSG','4845','projected_crs','EPSG','6624','EPSG','1 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('EPSG','6625','NAD83(2011) / Utah Central (ftUS)',NULL,'EPSG','4497','EPSG','6318','EPSG','15298',NULL,0); INSERT INTO "usage" VALUES('EPSG','4846','projected_crs','EPSG','6625','EPSG','2257','EPSG','1142'); INSERT INTO "projected_crs" VALUES('EPSG','6626','NAD83(2011) / Utah North (ftUS)',NULL,'EPSG','4497','EPSG','6318','EPSG','15297',NULL,0); @@ -7653,6 +7659,7 @@ INSERT INTO "usage" VALUES('EPSG','17456','projected_crs','EPSG','9977','EPSG',' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7805,6 +7812,8 @@ INSERT INTO "usage" VALUES('EPSG','19184','projected_crs','EPSG','10280','EPSG', >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main INSERT INTO "projected_crs" VALUES('EPSG','20002','MWC18 Grid',NULL,'EPSG','4400','EPSG','20033','EPSG','10127',NULL,0); INSERT INTO "usage" VALUES('EPSG','18336','projected_crs','EPSG','20002','EPSG','4666','EPSG','1141'); INSERT INTO "projected_crs" VALUES('EPSG','20004','Pulkovo 1995 / Gauss-Kruger zone 4',NULL,'EPSG','4530','EPSG','4200','EPSG','16204',NULL,0); diff --git a/data/sql/supersession.sql b/data/sql/supersession.sql index 9d05cecfc94e..222cf7379849 100644 --- a/data/sql/supersession.sql +++ b/data/sql/supersession.sql @@ -279,6 +279,7 @@ INSERT INTO "supersession" VALUES('grid_transformation','EPSG','9629','grid_tran <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -411,3 +412,5 @@ INSERT INTO "supersession" VALUES('helmert_transformation','EPSG','15891','helme >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main diff --git a/docs/common.py b/docs/common.py index 3ee19c708716..f556cf734a79 100644 --- a/docs/common.py +++ b/docs/common.py @@ -163,6 +163,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6d9a5b626 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -228,6 +229,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main .. |geoserver_version| replace:: %(geoserver_version)s ======= <<<<<<< HEAD @@ -565,6 +568,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -1449,6 +1453,8 @@ ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -1459,6 +1465,7 @@ ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -1468,8 +1475,13 @@ ======= ======= ======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -1679,6 +1691,9 @@ >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +.. |release_version| replace:: %(release_version)s +>>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -1695,6 +1710,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1778,6 +1794,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main .. |release_version_literal| replace:: ``%(release_version)s`` ======= .. |release_version| replace:: ``%(release_version)s`` @@ -1797,6 +1815,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -1879,10 +1898,13 @@ <<<<<<< HEAD ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) .. |release_version| replace:: %(release_version)s ======= @@ -2580,12 +2602,68 @@ ======= .. |release_version| replace:: %(release_version)s +.. |release_version_literal| replace:: ``%(release_version)s`` +======= +.. |release_version| replace:: %(release_version)s + +.. |release_version_literal| replace:: ``%(release_version)s`` +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +<<<<<<< HEAD +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +.. |release_version| replace:: %(release_version)s + .. |release_version_literal| replace:: ``%(release_version)s`` ======= .. |release_version| replace:: ``%(release_version)s`` >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +<<<<<<< HEAD +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +.. |release_version| replace:: %(release_version)s + +.. |release_version_literal| replace:: ``%(release_version)s`` +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +======= +.. |release_version| replace:: %(release_version)s + +.. |release_version_literal| replace:: ``%(release_version)s`` +>>>>>>> locationtech-main +======= +.. |release_version| replace:: ``%(release_version)s`` +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> b046434188 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD @@ -2594,6 +2672,34 @@ >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 338d952d43 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) .. |release_version| replace:: %(release_version)s +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +.. |release_version| replace:: %(release_version)s + +.. |release_version_literal| replace:: ``%(release_version)s`` +======= +.. |release_version| replace:: ``%(release_version)s`` +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +.. |release_version| replace:: %(release_version)s + +.. |release_version_literal| replace:: ``%(release_version)s`` +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -4199,6 +4305,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -4930,12 +5037,15 @@ >>>>>>> f0b9bd8121 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0104fb37e4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main """ % {"release": release, "release_version": release_version, "scala_binary_version": scala_binary_version, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4987,6 +5097,8 @@ >>>>>>> 0104fb37e4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> f0b9bd8121 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= "url_locationtech_release": url_locationtech_release, >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4994,6 +5106,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6d9a5b626c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5624,6 +5737,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main "url_github_archive": url_github_archive} # The language for content autogenerated by Sphinx. Refer to documentation diff --git a/docs/developer/introduction.rst b/docs/developer/introduction.rst index 76c7f48b5500..a3087cef580e 100644 --- a/docs/developer/introduction.rst +++ b/docs/developer/introduction.rst @@ -96,6 +96,7 @@ This downloads the latest development version. To check out the code for the lat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1752,11 +1753,14 @@ This downloads the latest development version. To check out the code for the lat ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76618c8da3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 694bcd3776 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1775,16 +1779,23 @@ This downloads the latest development version. To check out the code for the lat >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> e3976d40bc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -1796,23 +1807,29 @@ This downloads the latest development version. To check out the code for the lat <<<<<<< HEAD >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f9e8439b09 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 82d93995e4 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1820,6 +1837,7 @@ This downloads the latest development version. To check out the code for the lat >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2828,6 +2846,10 @@ This downloads the latest development version. To check out the code for the lat ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> bdbced26d4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main (``$VERSION`` = |release_version_literal|): ======= (``$VERSION`` = |release_version|): @@ -2895,6 +2917,7 @@ This downloads the latest development version. To check out the code for the lat .. code-block:: bash $ git checkout tags/geomesa-$VERSION -b geomesa-$VERSION +<<<<<<< HEAD >>>>>>> 10ade3dcd1 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -3591,6 +3614,8 @@ This downloads the latest development version. To check out the code for the lat $ git checkout tags/geomesa-$VERSION -b geomesa-$VERSION >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main Building and dependency management for GeoMesa is handled by `Maven `__. The Maven ``pom.xml`` file in the root directory of the source distribution contains a diff --git a/docs/plot/plot.py b/docs/plot/plot.py index 2018eff43404..a4fd7bf6d759 100755 --- a/docs/plot/plot.py +++ b/docs/plot/plot.py @@ -191,6 +191,7 @@ def project_xy(x, y, proj_string): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -313,6 +314,9 @@ def meridian(lon, lat_min, lat_max): ======= def meridian(lon, lat_min, lat_max): >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +def meridian(lon, lat_min, lat_max): +>>>>>>> locationtech-main ''' Calculate meridian coordinates. ''' @@ -324,6 +328,7 @@ def meridian(lon, lat_min, lat_max): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -446,6 +451,9 @@ def meridian(lon, lat_min, lat_max): ======= coords[:, 0] = lon >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + coords[:, 0] = lon +>>>>>>> locationtech-main coords[:, 1] = np.linspace(lat_min, lat_max, N_POINTS) return coords @@ -478,6 +486,7 @@ def build_graticule(lonmin=-180, lonmax=180, latmin=-85, latmax=85): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -623,6 +632,10 @@ def build_graticule(lonmin=-180, lonmax=180, latmin=-85, latmax=85): for lon in range(lonmin, lonmax+1, GRATICULE_WIDTH): graticule.append(meridian(lon, latmin, latmax)) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + for lon in range(lonmin, lonmax+1, GRATICULE_WIDTH): + graticule.append(meridian(lon, latmin, latmax)) +>>>>>>> locationtech-main for lat in range(latmin, latmax+1, GRATICULE_WIDTH): graticule.append(parallel(lat, lonmin, lonmax)) @@ -743,6 +756,7 @@ def plotproj(plotdef, data, outdir): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -919,6 +933,8 @@ def plotproj(plotdef, data, outdir): >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main for lon in plotdef['top_interrupted_lons']: for delta in [-0.0001, 0.0001]: merid = meridian(lon + delta, 0.0, plotdef['latmax']) @@ -930,6 +946,7 @@ def plotproj(plotdef, data, outdir): merid = meridian(lon + delta, plotdef['latmin'], 0) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -952,6 +969,8 @@ def plotproj(plotdef, data, outdir): >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main interrupted_lines.append(project(merid, plotdef['projstring'])) for line in interrupted_lines: diff --git a/docs/pom.xml b/docs/pom.xml index 55fc5af12c7e..5a8a1fa9c084 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -122,6 +122,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -135,11 +136,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6396,6 +6400,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6435,6 +6443,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6453,6 +6462,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6467,6 +6478,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6474,12 +6486,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6491,10 +6506,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6514,6 +6532,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6533,11 +6558,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6549,6 +6577,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6556,19 +6585,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6576,10 +6611,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6587,12 +6625,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6686,6 +6727,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6715,6 +6758,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6817,6 +6861,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6834,14 +6882,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6859,6 +6911,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6867,6 +6921,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6882,9 +6937,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7045,6 +7103,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7190,6 +7250,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9235,12 +9296,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11239,6 +11303,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/docs/requirements.txt b/docs/requirements.txt index 771e92c3b467..a53fbdf7d3d3 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -75,6 +75,7 @@ docutils<0.18 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> location-main @@ -588,6 +589,13 @@ sphinx-copybutton==0.5.1 ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +jinja2==3.1.2 +sphinx-copybutton==0.5.1 +======= +======= +>>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main <<<<<<< HEAD jinja2<3.1.0 <<<<<<< HEAD @@ -605,6 +613,7 @@ sphinx-copybutton==0.5.0 >>>>>>> ff6a156f4 (Fix docutils version for Sphinx docs build) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1bd1f7a3d7 (Fix docutils version for Sphinx docs build) @@ -615,6 +624,8 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 157d4fc79 (Fix docutils version for Sphinx docs build) ======= @@ -654,6 +665,7 @@ sphinx-copybutton==0.5.0 >>>>>>> 2aa923cc9 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 10ade3dcd1 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -664,11 +676,14 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> ad8b1886a (Fix docutils version for Sphinx docs build) >>>>>>> 157d4fc79 (Fix docutils version for Sphinx docs build) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> aef7701ee2 (Fix docutils version for Sphinx docs build) @@ -679,6 +694,8 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0fbf9e83e (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -696,6 +713,7 @@ sphinx-copybutton==0.5.0 >>>>>>> 8cbe155de (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 279de44d3f (GEOMESA-3176 Docs - fix download links in install instructions) @@ -706,6 +724,8 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f9e8439b0 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -714,6 +734,7 @@ sphinx-copybutton==0.5.0 >>>>>>> b489fd938 (Fix docutils version for Sphinx docs build) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a66a98702d (Fix docutils version for Sphinx docs build) @@ -724,12 +745,15 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 0fbf9e83e (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4b70e7f8fb (GEOMESA-3176 Docs - fix download links in install instructions) @@ -740,6 +764,8 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> ad8b1886a (Fix docutils version for Sphinx docs build) @@ -748,6 +774,7 @@ sphinx-copybutton==0.5.0 >>>>>>> f0ed80088 (Fix docutils version for Sphinx docs build) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e281ae3fc8 (Fix docutils version for Sphinx docs build) @@ -758,10 +785,13 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f9e8439b0 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -777,10 +807,14 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> f9e8439b0 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 9d67a6996 (Fix docutils version for Sphinx docs build) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a9ad505df (Fix docutils version for Sphinx docs build) <<<<<<< HEAD ======= @@ -796,6 +830,9 @@ sphinx-copybutton==0.5.0 ======= >>>>>>> locationtech-main ======= +>>>>>>> a9ad505df (Fix docutils version for Sphinx docs build) +>>>>>>> locationtech-main +======= ======= jinja2<3.1.0 sphinx-copybutton==0.5.0 @@ -804,6 +841,7 @@ sphinx-copybutton==0.5.0 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= @@ -3322,3 +3360,5 @@ sphinx-copybutton==0.5.0 >>>>>>> afb750b567 (Fix docutils version for Sphinx docs build) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main diff --git a/docs/source/apps/cs2cs.rst b/docs/source/apps/cs2cs.rst index 695c1c49a8cf..4ea66228976b 100644 --- a/docs/source/apps/cs2cs.rst +++ b/docs/source/apps/cs2cs.rst @@ -20,6 +20,7 @@ Synopsis <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -159,6 +160,9 @@ Synopsis ======= | [--authority ] [--no-ballpark] [--accuracy ] [--3d] >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + | [--authority ] [--no-ballpark] [--accuracy ] [--3d] +>>>>>>> locationtech-main | ([*+opt[=arg]* ...] [+to *+opt[=arg]* ...] | {source_crs} {target_crs}) | file ... @@ -177,6 +181,7 @@ Synopsis <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD - a CRS name and a coordinate epoch, separated with '@'. For example "ITRF2014@2025.0". (*added in 9.2*) ======= @@ -282,6 +287,8 @@ Synopsis >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main - a OGC URN combining references for compound coordinate reference systems (e.g "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" or custom abbreviated syntax "EPSG:2393+5717"), @@ -429,6 +436,7 @@ The following control parameters can appear in any order: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -572,6 +580,8 @@ The following control parameters can appear in any order: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main .. option:: --no-ballpark .. versionadded:: 8.0.0 @@ -697,6 +707,7 @@ The x-y output data will appear as three lines of: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -925,6 +936,8 @@ which is an approximation at a level of several tens of metres. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1402285.98 5076292.42 0.00 .. note:: @@ -934,6 +947,7 @@ which is an approximation at a level of several tens of metres. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -976,6 +990,8 @@ which is an approximation at a level of several tens of metres. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main Using EPSG CRS codes -------------------- diff --git a/docs/source/apps/geod.rst b/docs/source/apps/geod.rst index 1c7b31020035..7155545c1dc9 100644 --- a/docs/source/apps/geod.rst +++ b/docs/source/apps/geod.rst @@ -12,6 +12,7 @@ geod <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -125,6 +126,8 @@ geod >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main .. _invgeod: ================================================================================ @@ -136,6 +139,7 @@ invgeod <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -364,6 +368,8 @@ invgeod >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main Synopsis ******** @@ -495,6 +501,7 @@ specified distance from a geographic point. In both cases an <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -649,6 +656,11 @@ initial point must be specified with *+lat_1=lat* and *+lon_1=lon* parameters and either a terminus point *+lat_2=lat* and *+lon_2=lon* or a distance and azimuth from the initial point >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +initial point must be specified with *+lat_1=lat* and *+lon_1=lon* +parameters and either a terminus point *+lat_2=lat* and +*+lon_2=lon* or a distance and azimuth from the initial point +>>>>>>> locationtech-main with *+S=distance* and *+A=azimuth* must be specified. If points along a geodesic are to be determined then either diff --git a/docs/source/apps/proj.rst b/docs/source/apps/proj.rst index 0adfb8ff5228..8d6da60941a3 100644 --- a/docs/source/apps/proj.rst +++ b/docs/source/apps/proj.rst @@ -12,6 +12,7 @@ proj <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -125,6 +126,8 @@ proj >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main .. _invproj: ================================================================================ @@ -136,6 +139,7 @@ invproj <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -364,6 +368,8 @@ invproj >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main .. only:: html Cartographic projection filter. diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index 72e6bbee2bb4..bf4b4451a27d 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -52,6 +52,7 @@ Synopsis <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD - a CRS name and a coordinate epoch, separated with '@'. For example "ITRF2014@2025.0". (*added in 9.2*) ======= @@ -157,6 +158,8 @@ Synopsis >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main - a OGC URN combining references for compound coordinate reference systems (e.g "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" or custom abbreviated syntax "EPSG:2393+5717"), @@ -191,6 +194,7 @@ It can also be used to query coordinate operations available between two CRS. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -477,6 +481,9 @@ The program is named with some reference to the GDAL `gdalsrsinfo >>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +The program is named with some reference to the GDAL `gdalsrsinfo `__ utility that offers +>>>>>>> locationtech-main partly similar services. diff --git a/docs/source/community/code_contributions.rst b/docs/source/community/code_contributions.rst index c5d08bfb1dd4..9fe4faec4bbc 100644 --- a/docs/source/community/code_contributions.rst +++ b/docs/source/community/code_contributions.rst @@ -133,6 +133,7 @@ Preliminary step: install clang. For example: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -419,6 +420,9 @@ Configure PROJ with the `scan-build >>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +Configure PROJ with the `scan-build `__ utility of clang: +>>>>>>> locationtech-main :: mkdir csa_build @@ -433,6 +437,7 @@ Configure PROJ with the :program:`scan-build` utility of clang: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -719,6 +724,9 @@ Build using ``scan-build``: ======= Build using :program:`scan-build`: >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +Build using ``scan-build``: +>>>>>>> locationtech-main :: @@ -733,6 +741,7 @@ If CSA finds errors, they will be emitted during the build. And in which case, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1019,6 +1028,9 @@ at the end of the build process, ``scan-build`` will emit a warning message ======= at the end of the build process, :program:`scan-build` will emit a warning message >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +at the end of the build process, ``scan-build`` will emit a warning message +>>>>>>> locationtech-main indicating errors have been found and how to display the error report. This is with something like diff --git a/docs/source/community/rfc/rfc-1.rst b/docs/source/community/rfc/rfc-1.rst index 16a5b3b111a0..8eda764a66e9 100644 --- a/docs/source/community/rfc/rfc-1.rst +++ b/docs/source/community/rfc/rfc-1.rst @@ -44,6 +44,7 @@ List of PSC Members <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -166,6 +167,9 @@ List of PSC Members ======= (up-to-date as of 2018-06) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +(up-to-date as of 2018-06) +>>>>>>> locationtech-main * Kristian Evers `@kbevers `_ (DK) **Chair** * Howard Butler `@hobu `_ (USA) @@ -180,6 +184,7 @@ List of PSC Members <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Alan Snow `@snowman2 `_ (USA) ======= <<<<<<< HEAD @@ -284,6 +289,8 @@ List of PSC Members >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * Frank Warmerdam `@warmerdam `_ (USA) **Emeritus** Detailed Process diff --git a/docs/source/community/rfc/rfc-2.rst b/docs/source/community/rfc/rfc-2.rst index e4ddb4a355c7..806cc203e924 100644 --- a/docs/source/community/rfc/rfc-2.rst +++ b/docs/source/community/rfc/rfc-2.rst @@ -164,6 +164,7 @@ the ISO-19111 standard. The solution adopted here is to use std::weak_ptr <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -286,6 +287,9 @@ in the CoordinateOperation class to avoid the cycle. This design artefact is ======= in the CoordinateOperation class to avoid the cycle. This design artefact is >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +in the CoordinateOperation class to avoid the cycle. This design artefact is +>>>>>>> locationtech-main transparent to users. Another important design point is that all ISO19111 objects are immutable after @@ -771,6 +775,7 @@ New files (excluding makefile.am, CMakeLists.txt and other build infrastructure <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -893,6 +898,9 @@ artefacts): ======= artefacts): >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +artefacts): +>>>>>>> locationtech-main * include/proj/: Public installed C++ headers - `common.hpp`_: declarations of osgeo::proj::common namespace. diff --git a/docs/source/community/rfc/rfc-4.rst b/docs/source/community/rfc/rfc-4.rst index d06d1455be61..239a95f642b7 100644 --- a/docs/source/community/rfc/rfc-4.rst +++ b/docs/source/community/rfc/rfc-4.rst @@ -617,6 +617,7 @@ Weak points: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -739,6 +740,9 @@ Weak points: ======= to write explicit lon and lat variables with all values taken by the grid. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + to write explicit lon and lat variables with all values taken by the grid. +>>>>>>> locationtech-main GDAL has for many years supported a simpler syntax, using a GeoTransform attribute. diff --git a/docs/source/community/rfc/rfc-7.rst b/docs/source/community/rfc/rfc-7.rst index 2cfc4fc096e5..0f4104db68cf 100644 --- a/docs/source/community/rfc/rfc-7.rst +++ b/docs/source/community/rfc/rfc-7.rst @@ -76,6 +76,7 @@ developed with backwards-compatible policies that aim to provide consistent <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -198,6 +199,9 @@ behaviour across different versions. CMake is currently the preferred build ======= behaviour across different versions. CMake is currently the preferred build >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +behaviour across different versions. CMake is currently the preferred build +>>>>>>> locationtech-main tool for PROJ for the following reasons: - It has existed in the PROJ code base since 2014, and is familiar to active diff --git a/docs/source/conf.py b/docs/source/conf.py index f0cd1f7784a8..481e4a379ad2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -46,6 +46,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -316,6 +317,9 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + 'program_with_link', +>>>>>>> locationtech-main ] # Add any paths that contain templates here, relative to this directory. diff --git a/docs/source/development/reference/functions.rst b/docs/source/development/reference/functions.rst index eb7d239dd348..0764d80bb120 100644 --- a/docs/source/development/reference/functions.rst +++ b/docs/source/development/reference/functions.rst @@ -146,6 +146,7 @@ paragraph for more details. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -273,6 +274,8 @@ paragraph for more details. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main An "area of use" can be specified in area. When it is supplied, the more accurate transformation between two given systems can be chosen. @@ -305,6 +308,7 @@ paragraph for more details. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -459,6 +463,11 @@ paragraph for more details. :type `source_crs`: `const char*` :param `target_crs`: Destination SRS. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + :param `source_crs`: Source CRS. + :type `source_crs`: `const char*` + :param `target_crs`: Destination SRS. +>>>>>>> locationtech-main :type `target_crs`: `const char*` :param `area`: Descriptor of the desired area for the transformation. :type `area`: :c:type:`PJ_AREA` * @@ -481,6 +490,7 @@ paragraph for more details. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -608,6 +618,8 @@ paragraph for more details. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main :param `options`: a list of NUL terminated options, or NULL. The list of supported options is: @@ -634,6 +646,7 @@ paragraph for more details. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -772,6 +785,8 @@ paragraph for more details. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main - FORCE_OVER=YES/NO: can be set to YES to force the ``+over`` flag on the transformation returned by this function. See :ref:`longitude_wrapping` @@ -856,6 +871,7 @@ Coordinate transformation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -978,6 +994,9 @@ Coordinate transformation ======= Return the operation used during the last invokation of proj_trans(). >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + Return the operation used during the last invokation of proj_trans(). +>>>>>>> locationtech-main This is especially useful when P has been created with proj_create_crs_to_crs() and has several alternative operations. The returned object must be freed with proj_destroy(). diff --git a/docs/source/faq.rst b/docs/source/faq.rst index 634c7d0be194..73d88229fccf 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -31,6 +31,7 @@ separate column. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -317,6 +318,9 @@ separate column. ======= :program:`ogr2ogr` application. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + `ogr2ogr `__ application. +>>>>>>> locationtech-main Can I transform from *abc* to *xyz*? -------------------------------------------------------------------------------- @@ -350,6 +354,7 @@ ETRS89/UTM32N (EPSG:25832) and ETRS89/DKTM1 (EPSG:4093): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -643,6 +648,9 @@ See the :program:`projinfo` documentation for more info on how to use it. See the :program:`projinfo` :ref:`documentation ` for more info on how to use it. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +See the :program:`projinfo` documentation for more info on how to use it. +>>>>>>> locationtech-main Coordinate reference system *xyz* is not in the EPSG registry, what do I do? -------------------------------------------------------------------------------- diff --git a/docs/source/install.rst b/docs/source/install.rst index 2787eb762b55..d23a3f845c30 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -110,6 +110,7 @@ Fedora <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -396,6 +397,9 @@ On Fedora the ``dnf`` package manager is used:: ======= On Fedora the :program:`dnf` package manager is used:: >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +On Fedora the ``dnf`` package manager is used:: +>>>>>>> locationtech-main sudo dnf install proj @@ -410,6 +414,7 @@ Red Hat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -696,6 +701,9 @@ On Red Hat based system packages are installed with ``yum``:: ======= On Red Hat based system packages are installed with :program:`yum`:: >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +On Red Hat based system packages are installed with ``yum``:: +>>>>>>> locationtech-main sudo yum install proj @@ -800,6 +808,7 @@ can be modified to suit the users needs. See :ref:`projsync` for more options. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1105,6 +1114,10 @@ can be modified to suit the users needs. See :ref:`projsync` for more options. package can be downloaded and added to the :envvar:`PROJ_DATA` directory (called ``PROJ_LIB`` before PROJ 9.1) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + package can be downloaded and its content decompressed into one of the + directories where PROJ looks for :ref:`resources ` +>>>>>>> locationtech-main Starting with PROJ 9.2, a ``uninstall`` target is available to remove files installed by the ``install`` target:: diff --git a/docs/source/news.rst b/docs/source/news.rst index a202187daeb2..65822bd636c0 100644 --- a/docs/source/news.rst +++ b/docs/source/news.rst @@ -42,6 +42,7 @@ Bug fixes <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -164,6 +165,9 @@ Bug fixes ======= * ``vandg`` projection: handle ``+over`` to extend the validity domain outside of ``|lon|>180deg`` (`#3427 `_) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +* ``vandg`` projection: handle ``+over`` to extend the validity domain outside of ``|lon|>180deg`` (`#3427 `_) +>>>>>>> locationtech-main * ``eqdc`` projection: avoid floating point division by zero in non-nominal case (`#3415 `_) @@ -328,6 +332,7 @@ Bug fixes <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -450,6 +455,9 @@ Bug fixes ======= * Fix comparison of GeodeticRefrenceFrame vs DynamicGeodeticReferenceFrame (`#3120 `_) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +* Fix comparison of GeodeticRefrenceFrame vs DynamicGeodeticReferenceFrame (`#3120 `_) +>>>>>>> locationtech-main * :cpp:func:`createOperations`: fix transformation involving CompoundCRS, ToWGS84 and PROJ4_GRIDS (`#3124 `_) @@ -675,6 +683,7 @@ Bug fixes <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -797,6 +806,9 @@ Bug fixes ======= * Fix performance issue on pipeline instanciation of huge (broken) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +* Fix performance issue on pipeline instanciation of huge (broken) +>>>>>>> locationtech-main pipelines (`#2824 `_) * Make sure to re-order projection parameters according to their canonical @@ -814,6 +826,7 @@ Bug fixes <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -936,6 +949,9 @@ Bug fixes ======= * Fix handling of edge-case coordinates in invers ortho ellipsoidal >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +* Fix handling of edge-case coordinates in invers ortho ellipsoidal +>>>>>>> locationtech-main oblique (`#2855 `_) * :c:func:`proj_normalize_for_visualization()`: set input and output units when there @@ -1004,6 +1020,7 @@ Bug Fixes <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1126,6 +1143,9 @@ Bug Fixes ======= CRS that has a fallback-to-PROJ4-string behaviour and is a BoundCRS of a >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + CRS that has a fallback-to-PROJ4-string behaviour and is a BoundCRS of a +>>>>>>> locationtech-main GeographicCRS (`#2808 `_) * WKT2 import/export: preserve PROJ.4 CRS extension string in REMARKS[] (`#2812 `_) @@ -1242,6 +1262,7 @@ Bug fixes <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1364,6 +1385,9 @@ Bug fixes ======= replacement uses an unknow grid (`#2623 `_) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + replacement uses an unknow grid (`#2623 `_) +>>>>>>> locationtech-main * Fix build on Solaris 11.4 (`#2621 `_) diff --git a/docs/source/operations/projections/aeqd.rst b/docs/source/operations/projections/aeqd.rst index 4df8f29aae88..a3d286e7638e 100644 --- a/docs/source/operations/projections/aeqd.rst +++ b/docs/source/operations/projections/aeqd.rst @@ -16,6 +16,7 @@ Azimuthal Equidistant <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -304,6 +305,10 @@ Azimuthal Equidistant >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +| **Defined area** | Global | ++---------------------+----------------------------------------------------------+ +>>>>>>> locationtech-main | **Alias** | aeqd | +---------------------+----------------------------------------------------------+ | **Domain** | 2D | diff --git a/docs/source/operations/projections/calcofi.rst b/docs/source/operations/projections/calcofi.rst index f8b080e27715..2e532e3b8437 100644 --- a/docs/source/operations/projections/calcofi.rst +++ b/docs/source/operations/projections/calcofi.rst @@ -54,6 +54,7 @@ Usage <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -176,6 +177,9 @@ A typical forward CalCOFI projection would be from lon/lat coordinates on the ======= A typical forward CalCOFI projection would be from lon/lat coordinates on the >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +A typical forward CalCOFI projection would be from lon/lat coordinates on the +>>>>>>> locationtech-main Clark 1866 ellipsoid. For example:: @@ -194,6 +198,7 @@ Output of the above command:: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -316,6 +321,9 @@ The reverse projection from line/station coordinates to lon/lat would be entered ======= The reverse projection from line/station coordinates to lon/lat would be entered >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +The reverse projection from line/station coordinates to lon/lat would be entered +>>>>>>> locationtech-main as:: proj +proj=calcofi +ellps=clrk66 -I -E -f "%.2f" <>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +it is instanciated with particular values of the ``lat_ts`` parameter: +>>>>>>> locationtech-main +----------------------------------+------------+ | **Name** | **lat_ts** | diff --git a/docs/source/operations/projections/gnom.rst b/docs/source/operations/projections/gnom.rst index 6df7974f68ab..7aacf1feaf67 100644 --- a/docs/source/operations/projections/gnom.rst +++ b/docs/source/operations/projections/gnom.rst @@ -12,6 +12,7 @@ Gnomonic <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -125,6 +126,8 @@ Gnomonic >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main For a sphere, the gnomonic projection is a projection from the center of the sphere onto a plane tangent to the center point of the projection. This projects great circles to straight lines. For an ellipsoid, it is @@ -139,6 +142,7 @@ point). For details, see Section 8 of :cite:`Karney2013`. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -176,6 +180,8 @@ point). For details, see Section 8 of :cite:`Karney2013`. ======= >>>>>>> ba006ad292 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main +---------------------+----------------------------------------------------------+ | **Classification** | Azimuthal | +---------------------+----------------------------------------------------------+ @@ -185,6 +191,7 @@ point). For details, see Section 8 of :cite:`Karney2013`. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 13395ba73 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) @@ -523,6 +530,8 @@ point). For details, see Section 8 of :cite:`Karney2013`. +---------------------+----------------------------------------------------------+ | **Defined area** | Global | >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main +---------------------+----------------------------------------------------------+ | **Alias** | gnom | +---------------------+----------------------------------------------------------+ @@ -547,6 +556,7 @@ point). For details, see Section 8 of :cite:`Karney2013`. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -833,6 +843,9 @@ point). For details, see Section 8 of :cite:`Karney2013`. ======= proj-string: ``+proj=gnom +lat_0=90 +lon_0=-50`` >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + proj-string: ``+proj=gnom +lat_0=90 +lon_0=-50 +R=6.4e6`` +>>>>>>> locationtech-main Parameters ################################################################################ @@ -851,6 +864,7 @@ Parameters <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -925,6 +939,8 @@ Parameters ======= >>>>>>> ba006ad292 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main .. include:: ../options/x_0.rst .. include:: ../options/y_0.rst @@ -935,6 +951,7 @@ Parameters <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) @@ -1292,3 +1309,5 @@ Parameters >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main diff --git a/docs/source/operations/transformations/horner.rst b/docs/source/operations/transformations/horner.rst index c69cf2ebdddd..97dc5509e0fb 100644 --- a/docs/source/operations/transformations/horner.rst +++ b/docs/source/operations/transformations/horner.rst @@ -243,6 +243,7 @@ Optional <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -365,6 +366,9 @@ Optional ======= the inverse tranformation. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + the inverse tranformation. +>>>>>>> locationtech-main .. option:: +inv_u= @@ -380,6 +384,7 @@ Optional <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -502,6 +507,9 @@ Optional ======= the inverse tranformation. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + the inverse tranformation. +>>>>>>> locationtech-main .. option:: +inv_v= @@ -517,6 +525,7 @@ Optional <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -639,6 +648,9 @@ Optional ======= the inverse tranformation. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + the inverse tranformation. +>>>>>>> locationtech-main .. option:: +inv_c= @@ -654,6 +666,7 @@ Optional <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -776,6 +789,9 @@ Optional ======= the inverse tranformation. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + the inverse tranformation. +>>>>>>> locationtech-main .. option:: +range= diff --git a/docs/source/operations/transformations/tinshift.rst b/docs/source/operations/transformations/tinshift.rst index c1d63f632216..24cca721fc40 100644 --- a/docs/source/operations/transformations/tinshift.rst +++ b/docs/source/operations/transformations/tinshift.rst @@ -178,6 +178,7 @@ fallback_strategy <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -300,6 +301,9 @@ fallback_strategy ======= specified triangles are not transformed. This is also the behaviour for >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + specified triangles are not transformed. This is also the behaviour for +>>>>>>> locationtech-main ``format_version`` before 1.1. If ``fallback_strategy`` is set to ``nearest_side``, then points that do not fall into any triangle are transformed according to the triangle closest to them by euclidean distance. diff --git a/docs/source/resource_files.rst b/docs/source/resource_files.rst index 6e106d5e7481..688e95bea1fe 100644 --- a/docs/source/resource_files.rst +++ b/docs/source/resource_files.rst @@ -124,6 +124,7 @@ Its default content is: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -185,6 +186,8 @@ Its default content is: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main :: [general] @@ -222,6 +225,7 @@ Its default content is: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -321,6 +325,8 @@ Its default content is: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main Transformation grids @@ -504,6 +510,7 @@ To compile the program do something like the following to produce the binary <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -790,6 +797,9 @@ To compile the program do something like the following to produce the binary ======= :program:`htdp` from the source code. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +``htdp`` from the source code. +>>>>>>> locationtech-main :: @@ -843,6 +853,7 @@ continental US region is used. The script creates a set of sample points for <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -917,6 +928,8 @@ continental US region is used. The script creates a set of sample points for ======= >>>>>>> ba006ad292 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main the grid definition, runs ``htdp`` against it and then parses the resulting points and computes a point by point shift to encode into the final grid shift file. By default it is assumed that ``htdp`` is in the @@ -927,6 +940,7 @@ The ``htdp`` program supports transformations between many CRSes and for each (o <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -1287,6 +1301,8 @@ executable path. If not, please provide the path to the executable using the The :program:`htdp` program supports transformations between many CRSes and for each (or >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main most?) of them you need to provide a date at which the CRS is fixed. The full set of CRS Ids available in the HTDP program are: diff --git a/docs/source/specifications/geodetictiffgrids.rst b/docs/source/specifications/geodetictiffgrids.rst index 55de61a912b9..9bfcc103202b 100644 --- a/docs/source/specifications/geodetictiffgrids.rst +++ b/docs/source/specifications/geodetictiffgrids.rst @@ -234,6 +234,7 @@ is an easy way to inspect such grid files: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -356,6 +357,9 @@ is an easy way to inspect such grid files: ======= offseting when the horizontal and vertical grids do not have the same >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + offseting when the horizontal and vertical grids do not have the same +>>>>>>> locationtech-main resolution, as found in some NADCON5 grids. Added in PROJ 9.2 Corresponds to PROJ :ref:`gridshift` method. diff --git a/docs/source/specifications/projjson.rst b/docs/source/specifications/projjson.rst index fcc05e96ef84..1dc1eea7cbcf 100644 --- a/docs/source/specifications/projjson.rst +++ b/docs/source/specifications/projjson.rst @@ -58,6 +58,7 @@ History of the schema <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -209,6 +210,9 @@ History of the schema ======= * v0.6: additional optional "source_crs" property in "abridged_transformation". Implemented in PROJ 9.2 >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +* v0.6: additional optional "source_crs" property in "abridged_transformation". Implemented in PROJ 9.2 +>>>>>>> locationtech-main * v0.5: - Implemented in PROJ 9.1: + add "meridian" member in Axis object type. @@ -245,6 +249,7 @@ More formally, the ``type`` should be specified if the JSON schema specifies alt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -367,6 +372,9 @@ types for the value of a member using the oneOf constrct and those alternative ======= types for the value of a member using the oneOf constrct and those alternative >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +types for the value of a member using the oneOf constrct and those alternative +>>>>>>> locationtech-main types have a ``type`` member. Otherwise it may be omitted. High level objects @@ -461,6 +469,7 @@ of a "object usage" class. An object usage has the following optional members: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -583,6 +592,9 @@ of a "object usage" class. An object usage has the following optional members: ======= not modify the definining parameters of the object. e.g "Use NTv2 file for better accuracy" >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + not modify the definining parameters of the object. e.g "Use NTv2 file for better accuracy" +>>>>>>> locationtech-main - ``id`` (mutually exclusive with ``ids``): (optional) Identifier of the object, as defined in :ref:`identifiers` - ``ids`` (mutually exclusive with ``id``): (optional) Identifiers of the object, as defined in :ref:`identifiers` @@ -899,6 +911,7 @@ of the PROJ software version 9.0.0 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1021,6 +1034,9 @@ of the PROJ software version 9.0.0 ======= did not have the datum ensemble concept. Consquently they used a ``datum`` >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + did not have the datum ensemble concept. Consquently they used a ``datum`` +>>>>>>> locationtech-main member instead of a ``datum_ensemble``. The number of elements in the datum ensemble may also vary over time when new realizations of WGS 84 are added to the ensemble. @@ -1633,6 +1649,7 @@ in the OGC Topic 2 abstract specification / ISO-19111:2019. In particular, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1755,6 +1772,9 @@ the members of a coumpound CRS can be a Bound CRS in this specification, whereas ======= the members of a coumpound CRS can be a Bound CRS in this specification, whereas >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +the members of a coumpound CRS can be a Bound CRS in this specification, whereas +>>>>>>> locationtech-main OGC Topic 2 abstract specification restricts it to single CRS. A Bound CRS can also be used as the source or target of a coordinate operation. @@ -1768,6 +1788,7 @@ PROJJSON omissions <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1829,6 +1850,8 @@ This specification does not define an encoding for triaxial ellipsoid (``TRIAXIA >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main This specification does not define an encoding for: - triaxial ellipsoid (``TRIAXIAL`` WKT keyword) @@ -1839,6 +1862,7 @@ This specification does not define an encoding for: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1938,6 +1962,8 @@ This specification does not define an encoding for triaxial ellipsoid (``TRIAXIA >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main Reference implementation ------------------------ @@ -1950,6 +1976,7 @@ PROJJSON is available as input and output of the `PROJ `_ soft <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2075,3 +2102,7 @@ The current version is the PROJJSON schema is 0.4. The current version is the PROJJSON schema is 0.4. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + +The current version is the PROJJSON schema is 0.4. +>>>>>>> locationtech-main diff --git a/docs/source/tutorials/EUREF2019/exercises/projections3.gie b/docs/source/tutorials/EUREF2019/exercises/projections3.gie index f40b97c1ef42..b8e3b56cfb28 100644 --- a/docs/source/tutorials/EUREF2019/exercises/projections3.gie +++ b/docs/source/tutorials/EUREF2019/exercises/projections3.gie @@ -41,6 +41,7 @@ expect 1506742.2481 6535299.3398 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -163,6 +164,9 @@ expect 1506742.2481 6535299.3398 ======= this exercise we will model the behaviour of the UTM projection using the >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + this exercise we will model the behaviour of the UTM projection using the +>>>>>>> locationtech-main Transverse Mercator. @@ -222,6 +226,7 @@ For all the exercises below the aim is to find the lowest tolerance for each <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -344,6 +349,9 @@ roundtrip test. You can of course make alle tests pass by setting a tolerance of ======= roundtrip test. You can of course make alle tests pass by setting a tolerance of >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +roundtrip test. You can of course make alle tests pass by setting a tolerance of +>>>>>>> locationtech-main 1000 km - that's not the point: How low can you go? After you have answered all ex. 3 questions below, based on your findings diff --git a/docs/source/tutorials/EUREF2019/exercises/projections3.rst b/docs/source/tutorials/EUREF2019/exercises/projections3.rst index a99cd4d44153..fb77d48a25d3 100644 --- a/docs/source/tutorials/EUREF2019/exercises/projections3.rst +++ b/docs/source/tutorials/EUREF2019/exercises/projections3.rst @@ -33,6 +33,7 @@ The backbone of the UTM projection is a Transverse Mercator projection. In <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -155,6 +156,9 @@ this exercise we will model the behaviour of the UTM projection using the ======= this exercise we will model the behaviour of the UTM projection using the >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +this exercise we will model the behaviour of the UTM projection using the +>>>>>>> locationtech-main Transverse Mercator. @@ -202,6 +206,7 @@ For all the exercises below the aim is to find the lowest tolerance for each <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -324,6 +329,9 @@ roundtrip test. You can of course make alle tests pass by setting a tolerance of ======= roundtrip test. You can of course make alle tests pass by setting a tolerance of >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +roundtrip test. You can of course make alle tests pass by setting a tolerance of +>>>>>>> locationtech-main 1000 km - that's not the point: How low can you go? After you have answered all exercise 3 questions below, based on your findings diff --git a/docs/source/usage/projections.rst b/docs/source/usage/projections.rst index 2ab3f5bc9308..78a76e03fa30 100644 --- a/docs/source/usage/projections.rst +++ b/docs/source/usage/projections.rst @@ -76,6 +76,7 @@ radians are interpreted to be decimal degrees by convention. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -198,6 +199,9 @@ Explict specification of input units can be accomplished by adding the appropria ======= Explict specification of input units can be accomplished by adding the appropriate >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +Explict specification of input units can be accomplished by adding the appropriate +>>>>>>> locationtech-main suffix to input values. @@ -222,6 +226,7 @@ suffix to input values. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -344,6 +349,9 @@ Example of use. The longitude of the central meridian ``+lon_0=90``, can also b ======= Example of use. The longitude of the central meridian ``+lon_0=90``, can also be expressed more explictly >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +Example of use. The longitude of the central meridian ``+lon_0=90``, can also be expressed more explictly +>>>>>>> locationtech-main with units of decimal degrees as ``+lon_0=90d`` or in radian units as ``+lon_0=1.570796r`` (approximately). diff --git a/docs/source/usage/quickstart.rst b/docs/source/usage/quickstart.rst index c00ccad72ef8..eb5819522f6b 100644 --- a/docs/source/usage/quickstart.rst +++ b/docs/source/usage/quickstart.rst @@ -43,6 +43,7 @@ type the input data manually and getting a response presented on screen. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -329,6 +330,9 @@ pipe data to the utility, for instance by using the ``echo`` command: ======= pipe data to the utility, for instance by using the :program:`echo` command: >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +pipe data to the utility, for instance by using the ``echo`` command: +>>>>>>> locationtech-main :: diff --git a/docs/tutorials/geomesa-fs-on-azure.rst b/docs/tutorials/geomesa-fs-on-azure.rst index 0ec57b9f3089..abb467ea7bc8 100644 --- a/docs/tutorials/geomesa-fs-on-azure.rst +++ b/docs/tutorials/geomesa-fs-on-azure.rst @@ -311,6 +311,7 @@ Back inside the Apache Spark container on your master node run the following: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -367,6 +368,9 @@ Back inside the Apache Spark container on your master node run the following: ======= ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main wget https://repo1.maven.org/maven2/org/locationtech/geomesa/geomesa-jupyter-leaflet_2.12/${VERSION}/geomesa-jupyter-leaflet_${VERSION}.jar jupyter toree install \ --spark_home=/home/spark-current \ @@ -375,6 +379,7 @@ Back inside the Apache Spark container on your master node run the following: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -470,6 +475,9 @@ Back inside the Apache Spark container on your master node run the following: ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main If you have increased the size of your cluster, you should also increase ``--num-executors`` accordingly. You can also set other executor and driver options by editing the ``spark_opts`` contents. diff --git a/docs/user/accumulo/commandline.rst b/docs/user/accumulo/commandline.rst index 292b2c099043..d64594aa5c41 100644 --- a/docs/user/accumulo/commandline.rst +++ b/docs/user/accumulo/commandline.rst @@ -99,6 +99,7 @@ in the Accumulo documentation for additional details. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -160,6 +161,9 @@ in the Accumulo documentation for additional details. ======= ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> locationtech-main .. note:: Bulk ingest is currently only implemented for Accumulo 2.0. @@ -167,6 +171,7 @@ in the Accumulo documentation for additional details. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD @@ -258,6 +263,9 @@ in the Accumulo documentation for additional details. ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main The data to be ingested must be in the same distributed file system that Accumulo is using, and the ingest must run in ``distributed`` mode as a map/reduce job. diff --git a/docs/user/accumulo/install.rst b/docs/user/accumulo/install.rst index 61b123aec4b8..8fed62e0c3f7 100644 --- a/docs/user/accumulo/install.rst +++ b/docs/user/accumulo/install.rst @@ -17,6 +17,7 @@ Installing GeoMesa Accumulo <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -83,6 +84,8 @@ Installing GeoMesa Accumulo >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main ======= # note: |scala_binary_version| is the Scala build version $ export VERSION="|scala_binary_version|-${TAG}" @@ -90,6 +93,7 @@ Installing GeoMesa Accumulo <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -151,6 +155,8 @@ Installing GeoMesa Accumulo >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main Installing from the Binary Distribution --------------------------------------- @@ -234,6 +240,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -956,11 +963,14 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1559,6 +1569,10 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1578,6 +1592,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2123,9 +2138,15 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -2328,6 +2349,12 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -2340,6 +2367,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2442,9 +2470,12 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4311,6 +4342,14 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Download and extract it somewhere convenient: ======= @@ -4329,6 +4368,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4377,6 +4417,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -4437,6 +4479,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5075,6 +5118,16 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5083,14 +5136,18 @@ Download and extract it somewhere convenient: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 82d93995e4 (GEOMESA-3176 Docs - fix download links in install instructions) ======= +>>>>>>> locationtech-main +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5136,6 +5193,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -5165,6 +5226,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ecddd8c3e7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5283,6 +5345,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= ======= +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -5293,6 +5363,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3b4f3da2e1 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -5327,6 +5398,10 @@ Download and extract it somewhere convenient: >>>>>>> 5f428db977 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -5335,6 +5410,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ad7067b815 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5399,11 +5475,18 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5419,11 +5502,16 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> f9e8439b09 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -5463,9 +5551,16 @@ Download and extract it somewhere convenient: >>>>>>> b9bdd406e3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 96d5d442fa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') ======= @@ -7888,6 +7983,8 @@ Download and extract it somewhere convenient: >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main .. code-block:: bash @@ -7966,6 +8063,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -8688,11 +8786,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -9291,6 +9392,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9310,6 +9415,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -9855,9 +9961,15 @@ Download and extract it somewhere convenient: >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -10060,6 +10172,12 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -10072,6 +10190,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -10174,9 +10293,12 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -12053,6 +12175,14 @@ Download and extract it somewhere convenient: ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main $ wget "https://github.com/locationtech/geomesa/releases/download/geomesa-${TAG}/geomesa-accumulo_${VERSION}-bin.tar.gz" $ tar xvf geomesa-accumulo_${VERSION}-bin.tar.gz $ cd geomesa-accumulo_${VERSION} @@ -12069,6 +12199,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -12123,6 +12254,8 @@ Download and extract it somewhere convenient: ======= <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -12184,6 +12317,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -13048,6 +13182,16 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -13063,6 +13207,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -13115,6 +13260,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> a35efac12e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -13132,6 +13279,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -14767,6 +14915,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main $ wget "https://github.com/locationtech/geomesa/releases/download/geomesa-${TAG}/geomesa-accumulo_${VERSION}-bin.tar.gz" $ tar xvf geomesa-accumulo_${VERSION}-bin.tar.gz $ cd geomesa-accumulo_${VERSION} @@ -14812,6 +14964,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -14871,11 +15024,14 @@ Download and extract it somewhere convenient: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -15234,6 +15390,9 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -15253,6 +15412,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -15286,9 +15446,12 @@ Download and extract it somewhere convenient: ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) ======= +>>>>>>> locationtech-main +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +<<<<<<< HEAD >>>>>>> b4c1ea8881 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -17120,12 +17283,22 @@ Download and extract it somewhere convenient: ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> e3976d40bc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -17144,10 +17317,15 @@ Download and extract it somewhere convenient: >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f9e8439b09 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 82d93995e4 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -17173,12 +17351,19 @@ Download and extract it somewhere convenient: ======= ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main ======= $ wget "https://github.com/locationtech/geomesa/releases/download/geomesa-${TAG}/geomesa-accumulo_${VERSION}-bin.tar.gz" $ tar xvf geomesa-accumulo_${VERSION}-bin.tar.gz $ cd geomesa-accumulo_${VERSION} >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD >>>>>>> 42e8565e9b (Merge branch 'feature/postgis-fixes') @@ -17729,6 +17914,8 @@ Download and extract it somewhere convenient: >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main .. _accumulo_install_source: @@ -17946,6 +18133,7 @@ to match the target environment, and then run the script: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -18007,6 +18195,9 @@ to match the target environment, and then run the script: ======= ======= >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +======= +>>>>>>> locationtech-main .. warning:: Due to a classpath conflict with GeoServer, the version of Accumulo client JARs installed must be 1.9.2 or later. @@ -18075,6 +18266,7 @@ The specific JARs needed for some common configurations are listed below: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= <<<<<<< HEAD @@ -18166,6 +18358,9 @@ The specific JARs needed for some common configurations are listed below: ======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main Restart GeoServer after the JARs are installed. .. _install_geomesa_process: diff --git a/docs/user/accumulo/jobs.rst b/docs/user/accumulo/jobs.rst index fb408e04d10e..3e275922ce8d 100644 --- a/docs/user/accumulo/jobs.rst +++ b/docs/user/accumulo/jobs.rst @@ -32,6 +32,7 @@ GeoMesaAccumuloInputFormat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -98,6 +99,8 @@ GeoMesaAccumuloInputFormat >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main ======= org.locationtech.geomesa.jobs.interop.mapreduce.FeatureCountJob org.locationtech.geomesa.jobs.interop.mapreduce.FeatureWriterJob @@ -105,6 +108,7 @@ GeoMesaAccumuloInputFormat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -166,6 +170,8 @@ GeoMesaAccumuloInputFormat >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main The ``GeoMesaAccumuloInputFormat`` can be used to get ``SimpleFeature``\ s into your jobs directly from GeoMesa. @@ -228,6 +234,7 @@ The job can be invoked through Yarn as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= org.locationtech.geomesa.jobs.index.AttributeIndexJob \ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -347,6 +354,11 @@ The job can be invoked through Yarn as follows: org.locationtech.geomesa.jobs.index.AttributeIndexJob \ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + org.locationtech.geomesa.jobs.index.AttributeIndexJob \ +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main --geomesa.input.instanceId \ --geomesa.input.zookeepers \ --geomesa.input.user \ @@ -384,6 +396,7 @@ slightly): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= org.locationtech.geomesa.jobs.index.SchemaCopyJob \ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -503,6 +516,11 @@ slightly): org.locationtech.geomesa.jobs.index.SchemaCopyJob \ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + org.locationtech.geomesa.jobs.index.SchemaCopyJob \ +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main --geomesa.input.instanceId \ --geomesa.output.instanceId \ --geomesa.input.zookeepers \ diff --git a/docs/user/bigtable/dataproc.rst b/docs/user/bigtable/dataproc.rst index df686e3a407e..40f4569bdbab 100644 --- a/docs/user/bigtable/dataproc.rst +++ b/docs/user/bigtable/dataproc.rst @@ -50,6 +50,7 @@ Dataproc. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bdcaf0ab5e (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -2418,6 +2419,8 @@ Dataproc. >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main .. code-block:: shell $ gcloud components install cbt @@ -2516,6 +2519,7 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3474,11 +3478,14 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -3622,6 +3629,8 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -3629,6 +3638,7 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4022,6 +4032,8 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4045,6 +4057,7 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4524373ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4542,11 +4555,20 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -4668,6 +4690,8 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4675,6 +4699,7 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4685,12 +4710,15 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -4706,6 +4734,9 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib ======= >>>>>>> locationtech-main ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4718,6 +4749,7 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0c734cda2b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6617,6 +6649,12 @@ Now, configure the installation by downloading and unpacking the GeoMesa distrib ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main appropriately, and including the hbase-site.xml in the spark runtime jar. First set the version you want to use: .. parsed-literal:: @@ -6687,6 +6725,7 @@ Then download and configure the distribution: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4524373ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -9851,6 +9890,10 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> fdf0e4fe88 (GEOMESA-3176 Docs - fix download links in install instructions) ======= +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9872,6 +9915,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8b8075f529 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -10837,6 +10881,10 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -10854,6 +10902,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 23c024179 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 250f01786f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10884,6 +10933,10 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -10892,6 +10945,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10939,10 +10993,18 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ad3cedc4d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9abc630fdf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10974,9 +11036,17 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= ======= ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> fd5565dfba (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -10991,11 +11061,14 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= ======= ======= +>>>>>>> locationtech-main +======= appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bdbced26d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 25063957fc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11131,6 +11204,10 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: shell @@ -11201,6 +11278,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -12943,10 +13021,13 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a910ae135f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -13759,16 +13840,23 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> e3976d40bc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -13780,17 +13868,21 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f9e8439b09 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 82d93995e4 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -13799,6 +13891,8 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -13806,6 +13900,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -14278,6 +14373,10 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main $ tar xvf geomesa-bigtable_${VERSION}-bin.tar.gz ======= $ tar zxvf geomesa-bigtable_${VERSION}-bin.tar.gz @@ -14333,6 +14432,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15057,11 +15157,14 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -15180,6 +15283,8 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -15187,6 +15292,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15579,6 +15685,8 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 3e34d2451e (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main $ tar xvf geomesa-bigtable_${VERSION}-bin.tar.gz >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15604,6 +15712,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4524373ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16027,6 +16136,11 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main ======= $ tar xvf geomesa-bigtable_${VERSION}-bin.tar.gz >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -16040,6 +16154,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -16108,11 +16223,14 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -16234,6 +16352,8 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16241,6 +16361,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16251,6 +16372,8 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= $ tar xvf geomesa-bigtable_${VERSION}-bin.tar.gz @@ -16258,6 +16381,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -16273,6 +16397,9 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: ======= >>>>>>> locationtech-main ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16285,6 +16412,7 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0c734cda2b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -18350,6 +18478,13 @@ appropriately, and including the hbase-site.xml in the spark runtime jar: $ tar xvf geomesa-bigtable_${VERSION}-bin.tar.gz >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + $ tar xvf geomesa-bigtable_${VERSION}-bin.tar.gz +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main $ ln -s geomesa-bigtable_${VERSION} geomesa $ export PATH=$PATH:~/geomesa/bin $ export HADOOP_HOME=/usr/lib/hadoop diff --git a/docs/user/bigtable/install.rst b/docs/user/bigtable/install.rst index 245c9bc55197..9408228a84bd 100644 --- a/docs/user/bigtable/install.rst +++ b/docs/user/bigtable/install.rst @@ -12,6 +12,7 @@ Installing GeoMesa Bigtable <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -210,6 +211,8 @@ Installing GeoMesa Bigtable >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main .. note:: The examples below expect a version to be set in the environment: @@ -228,6 +231,7 @@ Installing GeoMesa Bigtable <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -489,6 +493,8 @@ Installing GeoMesa Bigtable >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main .. _install_bigtable_tools: Installing the Binary Distribution @@ -565,6 +571,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2296,10 +2303,13 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a910ae135f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -3052,16 +3062,23 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> e3976d40bc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -3073,17 +3090,21 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f9e8439b09 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 82d93995e4 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -3092,6 +3113,8 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3099,6 +3122,7 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -3674,9 +3698,12 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) Download and extract it somewhere convenient: ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> c82dea9d29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3786,6 +3813,8 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: ======= >>>>>>> 49a5a0454f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main .. note:: In the following examples, replace ``${TAG}`` with the corresponding GeoMesa version (e.g. |release_version|), and @@ -3805,6 +3834,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3951,6 +3981,8 @@ Extract it somewhere convenient: ======= >>>>>>> bc73cc4d41 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -3997,6 +4029,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4575,11 +4608,14 @@ Extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -4689,6 +4725,8 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -4696,6 +4734,7 @@ Extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5089,6 +5128,8 @@ Extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -5113,6 +5154,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4524373ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5537,6 +5579,11 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main +======= Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -5549,6 +5596,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -5617,11 +5665,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5743,6 +5794,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5750,6 +5803,7 @@ Download and extract it somewhere convenient: >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5760,6 +5814,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= Download and extract it somewhere convenient: @@ -5767,6 +5823,7 @@ Download and extract it somewhere convenient: >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -5782,6 +5839,9 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5794,6 +5854,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0c734cda2b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -7858,6 +7919,13 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +Download and extract it somewhere convenient: +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: bash @@ -7931,6 +7999,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -8817,11 +8886,14 @@ Download and extract it somewhere convenient: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8835,6 +8907,9 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -8843,6 +8918,7 @@ Download and extract it somewhere convenient: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8860,6 +8936,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -8872,10 +8950,13 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -8885,6 +8966,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9644,6 +9726,10 @@ Download and extract it somewhere convenient: >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main $ ls bin conf dist docs examples lib LICENSE.txt logs >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9686,6 +9772,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -10259,11 +10346,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -10382,6 +10472,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -10389,6 +10481,7 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10782,6 +10875,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10804,6 +10899,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4524373ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -11152,11 +11248,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -11298,11 +11397,16 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -11424,6 +11528,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11431,6 +11537,7 @@ Download and extract it somewhere convenient: >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11441,12 +11548,15 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -11462,6 +11572,9 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11474,6 +11587,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0c734cda2b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -13789,6 +13903,12 @@ Download and extract it somewhere convenient: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main To run the command-line tools, the configuration file ``hbase-site.xml`` must be on the classpath. This can be accomplished by placing the file in the ``conf`` folder. For more information, see `Connecting to Cloud Bigtable @@ -13830,6 +13950,7 @@ will download them from Maven Central. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14099,6 +14220,8 @@ will download them from Maven Central. >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main * hadoop-common-2.5.2.jar * hadoop-hdfs-2.5.2.jar diff --git a/docs/user/cassandra/install.rst b/docs/user/cassandra/install.rst index c8783a21047a..efb730cbd801 100644 --- a/docs/user/cassandra/install.rst +++ b/docs/user/cassandra/install.rst @@ -17,6 +17,7 @@ Installing GeoMesa Cassandra <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -83,6 +84,8 @@ Installing GeoMesa Cassandra >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main ======= # note: |scala_binary_version| is the Scala build version $ export VERSION="|scala_binary_version|-${TAG}" @@ -90,6 +93,7 @@ Installing GeoMesa Cassandra <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -151,6 +155,8 @@ Installing GeoMesa Cassandra >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main Connecting to Cassandra ----------------------- @@ -267,6 +273,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -989,11 +996,14 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1592,6 +1602,10 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1611,6 +1625,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2156,9 +2171,15 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -2361,6 +2382,12 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -2373,6 +2400,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2475,9 +2503,12 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4354,6 +4385,14 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Download and extract it somewhere convenient: ======= .. note:: @@ -4365,6 +4404,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4416,6 +4456,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -4481,6 +4523,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5479,6 +5522,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5486,6 +5531,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5667,6 +5713,10 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -5674,6 +5724,7 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6204,6 +6255,8 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -6233,6 +6286,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6823,6 +6877,14 @@ Download and extract it somewhere convenient: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -6843,6 +6905,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7406,6 +7469,12 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -7419,6 +7488,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7521,10 +7591,13 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -9166,12 +9239,19 @@ Download and extract it somewhere convenient: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9767,6 +9847,13 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +Download and extract it somewhere convenient: +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: bash @@ -9848,6 +9935,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -11000,22 +11088,30 @@ Download and extract it somewhere convenient: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f7cef54062 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15601,6 +15697,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -15639,6 +15737,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -15709,6 +15808,10 @@ Download and extract it somewhere convenient: >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15727,6 +15830,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6eb31fb652 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> ffe4f9fd41 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15770,11 +15874,18 @@ Download and extract it somewhere convenient: >>>>>>> b4c1ea8881 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154a (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 9c39003417 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15823,8 +15934,15 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD >>>>>>> 0fbf9e83e2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 17c1f8a18c (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -15949,8 +16067,13 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 9a4dff9e4f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -15966,9 +16089,14 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 2586fa6a40 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16251,6 +16379,8 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> locationtech-main +======= ======= $ ls bin/ conf/ dist/ docs/ examples/ lib/ LICENSE.txt logs/ @@ -16258,6 +16388,7 @@ Download and extract it somewhere convenient: >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d94c03a98e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16732,6 +16863,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. _cassandra_install_source: diff --git a/docs/user/cli/geotools.rst b/docs/user/cli/geotools.rst index 93cb686b809a..b3cdd74a7e79 100644 --- a/docs/user/cli/geotools.rst +++ b/docs/user/cli/geotools.rst @@ -27,6 +27,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -93,6 +94,8 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main ======= In the following examples, replace ``${TAG}`` with the corresponding GeoMesa version (e.g. |release_version|), and ``${VERSION}`` with the appropriate Scala plus GeoMesa versions (e.g. |scala_release_version|). @@ -100,6 +103,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -161,6 +165,8 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main Extract it somewhere convenient: diff --git a/docs/user/convert/function_overview.rst b/docs/user/convert/function_overview.rst index c0999c52bbc8..5aaf1d48c31c 100644 --- a/docs/user/convert/function_overview.rst +++ b/docs/user/convert/function_overview.rst @@ -159,6 +159,7 @@ List and Map Functions <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -2688,6 +2689,8 @@ Encoding Functions >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main Encoding Functions ~~~~~~~~~~~~~~~~~~ diff --git a/docs/user/convert/function_usage.rst b/docs/user/convert/function_usage.rst index e1978ce96d0a..411dc9ba9c8b 100644 --- a/docs/user/convert/function_usage.rst +++ b/docs/user/convert/function_usage.rst @@ -1042,6 +1042,7 @@ from ``List[String]`` to ``List[Double]``. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e7b61a536 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -3325,6 +3326,12 @@ from ``List[String]`` to ``List[Double]``. >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 9b3fdf0389 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD @@ -3353,6 +3360,7 @@ from ``List[String]`` to ``List[Double]``. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eee5d7ae15 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 9536729782 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -3421,11 +3429,16 @@ from ``List[String]`` to ``List[Double]``. ======= >>>>>>> 0e53503f9d (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD >>>>>>> 6a60e1afe4 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -3442,6 +3455,7 @@ from ``List[String]`` to ``List[Double]``. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1bc88f7e23 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -4208,6 +4222,12 @@ from ``List[String]`` to ``List[Double]``. >>>>>>> locationtech-main ======= ======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -4224,6 +4244,7 @@ from ``List[String]`` to ``List[Double]``. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 008feb67a (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -4560,10 +4581,18 @@ from ``List[String]`` to ``List[Double]``. <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e6748a57a8 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -8045,10 +8074,19 @@ from ``List[String]`` to ``List[Double]``. ======= ======= ======= +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +<<<<<<< HEAD >>>>>>> 27353f52e5 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> d86a5b91d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD @@ -8122,10 +8160,22 @@ from ``List[String]`` to ``List[Double]``. ======= ======= ======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cd8248bbd (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> e29e638726 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -8138,6 +8188,8 @@ from ``List[String]`` to ``List[Double]``. ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -8147,6 +8199,7 @@ from ``List[String]`` to ``List[Double]``. <<<<<<< HEAD >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ae5490a34 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 4b08d07fef (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -8159,11 +8212,14 @@ from ``List[String]`` to ``List[Double]``. ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD >>>>>>> 09c8a6d2f (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') @@ -8327,6 +8383,10 @@ from ``List[String]`` to ``List[Double]``. ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main Encoding Functions ~~~~~~~~~~~~~~~~~~ @@ -8452,6 +8512,7 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 008feb67a (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -9566,6 +9627,10 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> da2989bc34 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +======= +>>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -9573,6 +9638,7 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 119231a668 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> d4cf7f1e24 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -11436,6 +11502,9 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 063b0f26f0 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD @@ -11459,6 +11528,7 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> 1143da1625 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -11745,6 +11815,8 @@ Example: ``base64Decode('Zm9v')`` ======= >>>>>>> c52bac169a (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -11764,6 +11836,7 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 64d8177ac0 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -11839,6 +11912,12 @@ Example: ``base64Decode('Zm9v')`` ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD @@ -11848,6 +11927,7 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6938112d5 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -11869,6 +11949,8 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> 6938112d5 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> c52bac169a (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -11880,6 +11962,7 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -11920,6 +12003,11 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> locationtech-main >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -11931,6 +12019,7 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -12104,6 +12193,8 @@ Example: ``base64Decode('Zm9v')`` ======= >>>>>>> c52bac169a (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD @@ -12125,6 +12216,7 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c399a7eef (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -12566,12 +12658,16 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD +======= +======= +>>>>>>> locationtech-main >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -12732,6 +12828,9 @@ Example: ``base64Decode('Zm9v')`` ======= >>>>>>> locationtech-main ======= +>>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -12747,6 +12846,7 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 008feb67a (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -13251,10 +13351,26 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> locationtech-main ======= ======= +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -13315,6 +13431,12 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> locationtech-main ======= ======= +>>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -13322,6 +13444,9 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main ======= @@ -13329,6 +13454,7 @@ Example: ``base64Decode('Zm9v')`` ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3b121e7307 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -13702,9 +13828,14 @@ Example: ``base64Decode('Zm9v')`` ======= <<<<<<< HEAD ======= +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD >>>>>>> 0e53503f9d (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) @@ -16044,11 +16175,14 @@ Example: ``base64Decode('Zm9v')`` >>>>>>> 553cbb229b (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -16784,6 +16918,8 @@ Example: ``base64Decode('Zm9v')`` ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -16798,6 +16934,7 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9c337194ec (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 5d6a8a22c8 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -17053,6 +17190,8 @@ Example: ``base64Decode('Zm9v')`` ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -17062,17 +17201,21 @@ Example: ``base64Decode('Zm9v')`` <<<<<<< HEAD >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ae5490a34b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 82d1dee8a6 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 09c8a6d2fd (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 4da62c580e (GEOMESA-3109 Json array to object converter function (#2788)) @@ -17997,6 +18140,10 @@ Example: ``base64Decode('Zm9v')`` ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main State Functions ~~~~~~~~~~~~~~~ diff --git a/docs/user/convert/json.rst b/docs/user/convert/json.rst index d24a4734f72b..ef87ccda85ad 100644 --- a/docs/user/convert/json.rst +++ b/docs/user/convert/json.rst @@ -200,6 +200,7 @@ See below for an example. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 29f1317169 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -567,10 +568,13 @@ See below for an example. ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 35b3ecb03d (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> da0dbd0f47 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -597,9 +601,14 @@ See below for an example. >>>>>>> 6ee72f98ac (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 354c37f8b4 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -1822,6 +1831,12 @@ See below for an example. >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 275e53813 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -1837,6 +1852,7 @@ See below for an example. >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD >>>>>>> 063b0f26f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 6d26127ad6 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -2261,6 +2277,8 @@ See below for an example. >>>>>>> 7a670f84c4 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -2284,6 +2302,7 @@ See below for an example. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3456,6 +3475,12 @@ See below for an example. >>>>>>> 448369e575 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -3463,6 +3488,7 @@ See below for an example. ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7048ab588f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> locationtech-main @@ -4141,12 +4167,16 @@ See below for an example. >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 0e53503f9d (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89971e000 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> e634f5d579 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -4270,6 +4300,8 @@ See below for an example. ======= >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -4278,6 +4310,7 @@ See below for an example. >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 585cc74744 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -5008,6 +5041,8 @@ See below for an example. ======= >>>>>>> e5c8c292cc (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -5015,6 +5050,7 @@ See below for an example. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e080006042 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> a81060c48c (GEOMESA-3109 Json array to object converter function (#2788)) @@ -5042,10 +5078,17 @@ See below for an example. >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2d758409cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> b586a90765 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -5742,6 +5785,13 @@ See below for an example. ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +======= +>>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main mapToJson ~~~~~~~~~ @@ -5855,6 +5905,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -7752,6 +7803,13 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= >>>>>>> 0da1bb22c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -7769,6 +7827,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= ======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -7789,6 +7848,8 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) @@ -7802,6 +7863,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 097b5a0858 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD ======= @@ -7856,14 +7918,19 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= >>>>>>> 0e53503f9d (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 0d96d8bd55 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -7873,6 +7940,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -7901,6 +7969,9 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -7915,6 +7986,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -7963,9 +8035,12 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require >>>>>>> 9b21f252a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -8044,6 +8119,8 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -8059,6 +8136,9 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main ======= @@ -8068,6 +8148,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0f2a67fb44 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> e634f5d579 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -8078,6 +8159,8 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -8087,6 +8170,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -8295,12 +8379,16 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= >>>>>>> 1506607bc9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -8308,11 +8396,16 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8320,16 +8413,22 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require >>>>>>> cd83d09ace (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +<<<<<<< HEAD >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -8707,6 +8806,10 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require ======= >>>>>>> locationtech-main ======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -8717,6 +8820,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -8784,6 +8888,9 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> locationtech-main +======= +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -8797,6 +8904,7 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e5c8c292cc (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -11048,6 +11156,11 @@ key. This is useful for GeoMesa's JSON attribute types, which currently require >>>>>>> a1ccc017c6 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 0e53503f9d (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main jsonPath ~~~~~~~~ diff --git a/docs/user/download.rst b/docs/user/download.rst index 8d1eb5223cad..07639d8e1d8c 100644 --- a/docs/user/download.rst +++ b/docs/user/download.rst @@ -79,6 +79,7 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -194,12 +195,15 @@ Versions and Downloads ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -313,6 +317,10 @@ Versions and Downloads >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -330,6 +338,7 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -372,6 +381,8 @@ Versions and Downloads ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -380,6 +391,7 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -417,11 +429,14 @@ Versions and Downloads ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -454,11 +469,14 @@ Versions and Downloads ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -480,6 +498,8 @@ Versions and Downloads ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -487,6 +507,7 @@ Versions and Downloads >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -508,10 +529,13 @@ Versions and Downloads ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4648,6 +4672,10 @@ Versions and Downloads >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) The current recommended version of GeoMesa is |release_version_literal|. ======= +======= + The current recommended version of GeoMesa is |release_version_literal|. +======= +>>>>>>> locationtech-main The current recommended version of GeoMesa is |release_version|. >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -4662,6 +4690,7 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cdb4102515 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -5354,6 +5383,8 @@ Versions and Downloads ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5361,6 +5392,7 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5542,6 +5574,10 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -5549,6 +5585,7 @@ Versions and Downloads >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6079,6 +6116,8 @@ Versions and Downloads >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main The current recommended version of GeoMesa is |release_version_literal|. >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -6108,6 +6147,7 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6696,6 +6736,14 @@ Versions and Downloads >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main The current recommended version of GeoMesa is |release_version_literal|. >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -6716,6 +6764,7 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7291,6 +7340,12 @@ Versions and Downloads >>>>>>> 64e2e43818 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= The current recommended version of GeoMesa is |release_version_literal|. >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -7305,6 +7360,7 @@ Versions and Downloads <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7407,10 +7463,13 @@ Versions and Downloads <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7581,9 +7640,14 @@ Versions and Downloads <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +<<<<<<< HEAD ======= >>>>>>> 1cad375176 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -9666,6 +9730,15 @@ Versions and Downloads The current recommended version of GeoMesa is |release_version_literal|. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + The current recommended version of GeoMesa is |release_version_literal|. +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main <<<<<<< HEAD GeoMesa requires `Java`__ to run. GeoMesa supports Java LTS versions 8, 11 and 17. @@ -9715,6 +9788,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9776,6 +9850,9 @@ __ https://github.com/locationtech/geomesa/releases ======= ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +======= +>>>>>>> locationtech-main Older versions can be downloaded from the `Eclipse Maven repository`__. __ https://repo.eclipse.org/content/repositories/geomesa-releases/org/locationtech/geomesa @@ -9783,6 +9860,7 @@ __ https://repo.eclipse.org/content/repositories/geomesa-releases/org/locationte <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD @@ -9874,6 +9952,9 @@ __ https://repo.eclipse.org/content/repositories/geomesa-releases/org/locationte ======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main Maven Integration ----------------- @@ -9907,6 +9988,7 @@ and then include the desired ``geomesa-*`` dependencies: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= \ |scala_binary_version|\ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -10026,6 +10108,11 @@ and then include the desired ``geomesa-*`` dependencies: \ |scala_binary_version|\ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +======= + \ |scala_binary_version|\ +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main .. code-block:: xml @@ -10107,6 +10194,7 @@ and then include the desired ``geomesa-*`` dependencies: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 87bf55340 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -11961,8 +12049,48 @@ and then include the desired ``geomesa-*`` dependencies: ======= ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main geomesa-utils_${scala.binary.version} +======= +======= +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +======= +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') + geomesa-utils_${scala.abi.version} +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ${geomesa.version} +<<<<<<< HEAD >>>>>>> f0b9bd8121 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> location-main ======= @@ -12879,6 +13007,9 @@ and then include the desired ``geomesa-*`` dependencies: geomesa-utils_${scala.abi.version} ${geomesa.version} >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main ======= geomesa-utils_2.12 3.0.0 @@ -12891,6 +13022,7 @@ and then include the desired ``geomesa-*`` dependencies: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -12905,6 +13037,8 @@ and then include the desired ``geomesa-*`` dependencies: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -12919,6 +13053,7 @@ and then include the desired ``geomesa-*`` dependencies: ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD <<<<<<< HEAD geomesa-utils_${scala.abi.version} ======= @@ -15542,6 +15677,8 @@ and then include the desired ``geomesa-*`` dependencies: ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> locationtech-main geomesa-utils_${scala.abi.version} ${geomesa.version} >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15558,6 +15695,7 @@ and then include the desired ``geomesa-*`` dependencies: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 90ec70f559 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 610d4a0e13 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15656,6 +15794,12 @@ and then include the desired ``geomesa-*`` dependencies: ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> f9e8439b09 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main ======= geomesa-utils_${scala.abi.version} ${geomesa.version} @@ -15680,6 +15824,7 @@ and then include the desired ``geomesa-*`` dependencies: <<<<<<< HEAD >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5e1827657 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 269558cf9e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15694,10 +15839,15 @@ and then include the desired ``geomesa-*`` dependencies: ======= ======= ======= +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8cbe155de6 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 3b4f3da2e1 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15708,11 +15858,14 @@ and then include the desired ``geomesa-*`` dependencies: ======= >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5f428db977 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> ad7067b815 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15736,19 +15889,29 @@ and then include the desired ``geomesa-*`` dependencies: ======= ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> e3976d40bc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15764,12 +15927,17 @@ and then include the desired ``geomesa-*`` dependencies: ======= ======= ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16688,6 +16856,12 @@ and then include the desired ``geomesa-*`` dependencies: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main For cutting-edge development, nightly snapshots are available from Eclipse: diff --git a/docs/user/filesystem/example.rst b/docs/user/filesystem/example.rst index 49383bdd390f..8b26699d6f6c 100644 --- a/docs/user/filesystem/example.rst +++ b/docs/user/filesystem/example.rst @@ -18,6 +18,7 @@ folder which contains an example csv file that we will ingest. First set the ver <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') ======= @@ -178,6 +179,10 @@ folder which contains an example csv file that we will ingest. First set the ver ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. parsed-literal:: @@ -194,6 +199,7 @@ folder which contains an example csv file that we will ingest. First set the ver <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -240,6 +246,8 @@ folder which contains an example csv file that we will ingest. First set the ver >>>>>>> aff2787fc2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> b4c1ea8881 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main $ export VERSION="|scala_binary_version|-${TAG}" # note: |scala_binary_version| is the Scala build version ======= # note: |scala_binary_version| is the Scala build version @@ -250,6 +258,7 @@ folder which contains an example csv file that we will ingest. First set the ver <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 17c1f8a18c (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -720,11 +729,14 @@ Then download and extract the binary distribution: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= # note: |scala_binary_version| is the Scala build version $ export VERSION="|scala_binary_version|-${TAG}" >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +<<<<<<< HEAD ======= # note: |scala_binary_version| is the Scala build version $ export VERSION="|scala_binary_version|-${TAG}" @@ -1044,9 +1056,29 @@ Then download and extract the binary distribution: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') ======= +======= +>>>>>>> locationtech-main + +Then download and extract the binary distribution: +<<<<<<< HEAD +======= +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) + +.. parsed-literal:: + + $ export TAG="|release_version|" + # note: |scala_binary_version| is the Scala build version + $ export VERSION="|scala_binary_version|-${TAG}" Then download and extract the binary distribution: +.. note:: + + In the following examples, replace ``${TAG}`` with the corresponding GeoMesa version (e.g. |release_version|), and + ``${VERSION}`` with the appropriate Scala plus GeoMesa versions (e.g. |scala_release_version|). +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') + <<<<<<< HEAD >>>>>>> location-main ======= @@ -2419,6 +2451,7 @@ Then download and extract the binary distribution: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -3523,9 +3556,16 @@ Then download and extract the binary distribution: >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 63db7d154a (GEOMESA-3176 Docs - fix download links in install instructions) ======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5e1827657 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 9d708b240a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3543,6 +3583,8 @@ Then download and extract the binary distribution: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3555,6 +3597,7 @@ Then download and extract the binary distribution: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -3564,6 +3607,10 @@ Then download and extract the binary distribution: ======= >>>>>>> 610d4a0e13 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -3580,6 +3627,7 @@ Then download and extract the binary distribution: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -3659,6 +3707,11 @@ Then download and extract the binary distribution: ======= >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -3671,6 +3724,7 @@ Then download and extract the binary distribution: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6a26990f7 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 8cbe155de (GEOMESA-3176 Docs - fix download links in install instructions) @@ -3705,6 +3759,8 @@ Then download and extract the binary distribution: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3717,6 +3773,9 @@ Then download and extract the binary distribution: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main ======= @@ -3726,6 +3785,7 @@ Then download and extract the binary distribution: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 240977229 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3736,6 +3796,8 @@ Then download and extract the binary distribution: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3748,6 +3810,7 @@ Then download and extract the binary distribution: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 53a3e72cbf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -3759,6 +3822,8 @@ Then download and extract the binary distribution: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3769,6 +3834,7 @@ Then download and extract the binary distribution: >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4126,6 +4192,8 @@ Then download and extract the binary distribution: ======= <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4138,6 +4206,7 @@ Then download and extract the binary distribution: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -7724,6 +7793,16 @@ Then download and extract the binary distribution: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main $ cat examples/ingest/csv/example.csv The output should look like:: diff --git a/docs/user/filesystem/install.rst b/docs/user/filesystem/install.rst index 772b6d41fd9c..bdaa97b97fe8 100644 --- a/docs/user/filesystem/install.rst +++ b/docs/user/filesystem/install.rst @@ -13,6 +13,7 @@ Installing GeoMesa FileSystem <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -79,6 +80,8 @@ Installing GeoMesa FileSystem >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main ======= # note: |scala_binary_version| is the Scala build version $ export VERSION="|scala_binary_version|-${TAG}" @@ -86,6 +89,7 @@ Installing GeoMesa FileSystem <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -147,6 +151,8 @@ Installing GeoMesa FileSystem >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main Installing from the Binary Distribution --------------------------------------- @@ -230,6 +236,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -952,11 +959,14 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1555,6 +1565,10 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1574,6 +1588,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2119,9 +2134,15 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -2324,6 +2345,12 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -2336,6 +2363,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2438,9 +2466,12 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4317,6 +4348,14 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Download and extract it somewhere convenient: ======= .. note:: @@ -4328,6 +4367,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4379,6 +4419,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -4444,6 +4486,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5442,6 +5485,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5449,6 +5494,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5630,6 +5676,10 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -5637,6 +5687,7 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6167,6 +6218,8 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -6196,6 +6249,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6786,6 +6840,14 @@ Download and extract it somewhere convenient: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -6806,6 +6868,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7369,6 +7432,12 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -7382,6 +7451,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7484,10 +7554,13 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -9129,12 +9202,19 @@ Download and extract it somewhere convenient: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9730,6 +9810,13 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +Download and extract it somewhere convenient: +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: bash @@ -9811,6 +9898,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -10963,22 +11051,30 @@ Download and extract it somewhere convenient: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f7cef54062 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15564,6 +15660,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -15602,6 +15700,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -15672,6 +15771,10 @@ Download and extract it somewhere convenient: >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15690,6 +15793,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6eb31fb652 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> ffe4f9fd41 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15733,11 +15837,18 @@ Download and extract it somewhere convenient: >>>>>>> b4c1ea8881 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154a (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 9c39003417 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15786,8 +15897,15 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD >>>>>>> 0fbf9e83e2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 17c1f8a18c (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -15912,8 +16030,13 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 9a4dff9e4f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -15929,9 +16052,14 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 2586fa6a40 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16214,6 +16342,8 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> locationtech-main +======= ======= $ ls bin/ conf/ dist/ docs/ examples/ lib/ LICENSE.txt logs/ @@ -16221,6 +16351,7 @@ Download and extract it somewhere convenient: >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d94c03a98e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16695,6 +16826,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. _fsds_install_source: @@ -16760,6 +16895,7 @@ distribution into your GeoServer's ``lib`` directory: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -16821,6 +16957,9 @@ distribution into your GeoServer's ``lib`` directory: ======= ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main The FileSystem GeoServer plugin is bundled by default in the GeoMesa FS binary distribution. To install, extract ``$GEOMESA_FS_HOME/dist/gs-plugins/geomesa-fs-gs-plugin_${VERSION}-install.tar.gz`` into GeoServer's ``WEB-INF/lib`` directory. Note that this plugin contains a shaded JAR with Parquet 1.9.0 @@ -16829,6 +16968,7 @@ project from scratch with Maven. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -16920,6 +17060,9 @@ project from scratch with Maven. ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main .. code-block:: bash diff --git a/docs/user/hbase/install.rst b/docs/user/hbase/install.rst index 45e708d69dfb..21dd929c7f62 100644 --- a/docs/user/hbase/install.rst +++ b/docs/user/hbase/install.rst @@ -17,6 +17,7 @@ Installing GeoMesa HBase <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -83,6 +84,8 @@ Installing GeoMesa HBase >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main ======= # note: |scala_binary_version| is the Scala build version $ export VERSION="|scala_binary_version|-${TAG}" @@ -90,6 +93,7 @@ Installing GeoMesa HBase <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -151,6 +155,8 @@ Installing GeoMesa HBase >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main GeoMesa supports traditional HBase installations as well as HBase running on `Amazon's EMR `_ , `Hortonworks' Data Platform (HDP) `_, and the @@ -240,6 +246,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -962,11 +969,14 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1565,6 +1575,10 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1584,6 +1598,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2129,9 +2144,15 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -2334,6 +2355,12 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -2346,6 +2373,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2448,9 +2476,12 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4327,6 +4358,14 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Download and extract it somewhere convenient: ======= .. note:: @@ -4338,6 +4377,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4389,6 +4429,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -4454,6 +4496,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5452,6 +5495,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5459,6 +5504,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5640,6 +5686,10 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -5647,6 +5697,7 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6177,6 +6228,8 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -6206,6 +6259,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6796,6 +6850,14 @@ Download and extract it somewhere convenient: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -6816,6 +6878,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7379,6 +7442,12 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -7392,6 +7461,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7494,10 +7564,13 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -9139,12 +9212,19 @@ Download and extract it somewhere convenient: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9740,6 +9820,13 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +Download and extract it somewhere convenient: +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: bash @@ -9821,6 +9908,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -10973,22 +11061,30 @@ Download and extract it somewhere convenient: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f7cef54062 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15574,6 +15670,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -15612,6 +15710,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -15682,6 +15781,10 @@ Download and extract it somewhere convenient: >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15700,6 +15803,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6eb31fb652 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> ffe4f9fd41 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15743,11 +15847,18 @@ Download and extract it somewhere convenient: >>>>>>> b4c1ea8881 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154a (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 9c39003417 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15796,8 +15907,15 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD >>>>>>> 0fbf9e83e2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 17c1f8a18c (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -15922,8 +16040,13 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 9a4dff9e4f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -15939,9 +16062,14 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 2586fa6a40 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16224,6 +16352,8 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> locationtech-main +======= ======= $ ls bin/ conf/ dist/ docs/ examples/ lib/ LICENSE.txt logs/ @@ -16231,6 +16361,7 @@ Download and extract it somewhere convenient: >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d94c03a98e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16705,6 +16836,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. _hbase_install_source: @@ -16813,6 +16948,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16928,12 +17064,15 @@ this directory as follows: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -17047,6 +17186,10 @@ this directory as follows: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -17064,6 +17207,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -17106,6 +17250,8 @@ this directory as follows: ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -17114,6 +17260,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -17151,11 +17298,14 @@ this directory as follows: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -17188,11 +17338,14 @@ this directory as follows: ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -17214,6 +17367,8 @@ this directory as follows: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -17221,6 +17376,7 @@ this directory as follows: >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -17242,10 +17398,13 @@ this directory as follows: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -21382,6 +21541,10 @@ this directory as follows: >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar ${hbase.dynamic.jars.dir}/ ======= +======= + $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar ${hbase.dynamic.jars.dir}/ +======= +>>>>>>> locationtech-main hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -21396,6 +21559,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cdb4102515 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -22088,6 +22252,8 @@ this directory as follows: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -22095,6 +22261,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -22276,6 +22443,10 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -22283,6 +22454,7 @@ this directory as follows: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -22813,6 +22985,8 @@ this directory as follows: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -22842,6 +23016,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -23430,6 +23605,14 @@ this directory as follows: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -23450,6 +23633,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -24025,6 +24209,12 @@ this directory as follows: >>>>>>> 64e2e43818 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -24039,6 +24229,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -24141,10 +24332,13 @@ this directory as follows: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -24315,9 +24509,14 @@ this directory as follows: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +<<<<<<< HEAD ======= >>>>>>> 1cad375176 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -26400,6 +26599,15 @@ this directory as follows: $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar ${hbase.dynamic.jars.dir}/ +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. group-tab:: HBase 1.x @@ -26479,6 +26687,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -26594,12 +26803,15 @@ this directory as follows: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -26713,6 +26925,10 @@ this directory as follows: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -26730,6 +26946,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -26772,6 +26989,8 @@ this directory as follows: ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -26780,6 +26999,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -26817,11 +27037,14 @@ this directory as follows: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -26854,11 +27077,14 @@ this directory as follows: ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -26880,6 +27106,8 @@ this directory as follows: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -26887,6 +27115,7 @@ this directory as follows: >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -26908,10 +27137,13 @@ this directory as follows: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -31048,6 +31280,10 @@ this directory as follows: >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar ${hbase.dynamic.jars.dir}/ ======= +======= + $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar ${hbase.dynamic.jars.dir}/ +======= +>>>>>>> locationtech-main hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -31062,6 +31298,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cdb4102515 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -31754,6 +31991,8 @@ this directory as follows: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -31761,6 +32000,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -31942,6 +32182,10 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -31949,6 +32193,7 @@ this directory as follows: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -32479,6 +32724,8 @@ this directory as follows: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -32508,6 +32755,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -33096,6 +33344,14 @@ this directory as follows: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -33116,6 +33372,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -33691,6 +33948,12 @@ this directory as follows: >>>>>>> 64e2e43818 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -33705,6 +33968,7 @@ this directory as follows: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -33807,10 +34071,13 @@ this directory as follows: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -33981,9 +34248,14 @@ this directory as follows: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +<<<<<<< HEAD ======= >>>>>>> 1cad375176 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -36066,6 +36338,15 @@ this directory as follows: $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar ${hbase.dynamic.jars.dir}/ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + $ hadoop fs -put ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar ${hbase.dynamic.jars.dir}/ +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main If running on top of Amazon S3, you will need to use the ``aws s3`` command line tool. @@ -36149,6 +36430,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -36264,12 +36546,15 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -36383,6 +36668,10 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -36400,6 +36689,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -36442,6 +36732,8 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -36450,6 +36742,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -36487,11 +36780,14 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -36524,11 +36820,14 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -36550,6 +36849,8 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -36557,6 +36858,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -36578,10 +36880,13 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -40718,6 +41023,10 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ ======= +======= + $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ +======= +>>>>>>> locationtech-main aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -40732,6 +41041,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cdb4102515 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -41424,6 +41734,8 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -41431,6 +41743,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -41612,6 +41925,10 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -41619,6 +41936,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -42149,6 +42467,8 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -42178,6 +42498,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -42766,6 +43087,14 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -42786,6 +43115,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -43361,6 +43691,12 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 64e2e43818 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -43375,6 +43711,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -43477,10 +43814,13 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -43651,9 +43991,14 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +<<<<<<< HEAD ======= >>>>>>> 1cad375176 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -45736,6 +46081,15 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase2_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. group-tab:: HBase 1.x @@ -45815,6 +46169,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -45930,12 +46285,15 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -46049,6 +46407,10 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -46066,6 +46428,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -46108,6 +46471,8 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -46116,6 +46481,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -46153,11 +46519,14 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -46190,11 +46559,14 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -46216,6 +46588,8 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -46223,6 +46597,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -46244,10 +46619,13 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -50384,6 +50762,10 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ ======= +======= + $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ +======= +>>>>>>> locationtech-main aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -50398,6 +50780,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cdb4102515 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -51090,6 +51473,8 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -51097,6 +51482,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -51278,6 +51664,10 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -51285,6 +51675,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -51815,6 +52206,8 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -51844,6 +52237,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -52432,6 +52826,14 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -52452,6 +52854,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -53027,6 +53430,12 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line >>>>>>> 64e2e43818 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -53041,6 +53450,7 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -53143,10 +53553,13 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -53317,9 +53730,14 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +<<<<<<< HEAD ======= >>>>>>> 1cad375176 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -55402,6 +55820,15 @@ If running on top of Amazon S3, you will need to use the ``aws s3`` command line $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + $ aws s3 cp ${GEOMESA_HBASE_HOME}/dist/hbase/geomesa-hbase-distributed-runtime-hbase1_${VERSION}.jar s3://${hbase.dynamic.jars.dir}/ +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main If required, you may disable distributed processing by setting the system property ``geomesa.hbase.remote.filtering`` to ``false``. Note that this may have an adverse effect on performance. @@ -55624,6 +56051,7 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -56728,9 +57156,16 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 63db7d154a (GEOMESA-3176 Docs - fix download links in install instructions) ======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5e1827657 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 9d708b240a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -56748,6 +57183,8 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -56760,6 +57197,7 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -56768,6 +57206,10 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= ======= >>>>>>> 610d4a0e13 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main /path/to/geomesa-hbase_${VERSION}/bin/geomesa-hbase >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -56785,6 +57227,7 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -56861,6 +57304,11 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -56873,6 +57321,7 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6a26990f7 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 8cbe155de (GEOMESA-3176 Docs - fix download links in install instructions) @@ -56898,6 +57347,8 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= /path/to/geomesa-hbase_${VERSION}/bin/geomesa-hbase >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -56911,6 +57362,9 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main ======= @@ -56920,6 +57374,7 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 240977229 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -56929,6 +57384,8 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= /path/to/geomesa-hbase_${VERSION}/bin/geomesa-hbase >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -56942,6 +57399,7 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 53a3e72cbf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -56953,6 +57411,8 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -56963,6 +57423,7 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -57010,6 +57471,8 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -57022,6 +57485,7 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -60857,6 +61321,16 @@ variable ``GEOMESA_HBASE_HOME`` and add it to your path by modifying your bashrc ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + /path/to/geomesa-hbase_${VERSION}/bin/geomesa-hbase +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main Running Commands ^^^^^^^^^^^^^^^^ @@ -60900,6 +61374,7 @@ doesn't exist). <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -60961,6 +61436,9 @@ doesn't exist). ======= ======= >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +======= +>>>>>>> locationtech-main The specific JARs needed for some common configurations are listed below: .. tabs:: @@ -61019,6 +61497,7 @@ The specific JARs needed for some common configurations are listed below: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= <<<<<<< HEAD @@ -61110,6 +61589,9 @@ The specific JARs needed for some common configurations are listed below: ======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main Restart GeoServer after the JARs are installed. Connecting to External HBase Clusters Backed By S3 diff --git a/docs/user/kafka/index.rst b/docs/user/kafka/index.rst index 8de00167400e..7ae73af56508 100644 --- a/docs/user/kafka/index.rst +++ b/docs/user/kafka/index.rst @@ -73,6 +73,7 @@ To get started with the Kafka Data Store, try the :doc:`/tutorials/geomesa-quick <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) ======= @@ -185,3 +186,7 @@ To get started with the Kafka Data Store, try the :doc:`/tutorials/geomesa-quick ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main diff --git a/docs/user/kafka/install.rst b/docs/user/kafka/install.rst index 141d5fd0c301..ac232d679b36 100644 --- a/docs/user/kafka/install.rst +++ b/docs/user/kafka/install.rst @@ -134,6 +134,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -856,11 +857,14 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1459,6 +1463,10 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1478,6 +1486,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2023,9 +2032,15 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -2228,6 +2243,12 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -2240,6 +2261,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2342,9 +2364,12 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4221,6 +4246,14 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Download and extract it somewhere convenient: ======= .. note:: @@ -4232,6 +4265,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4283,6 +4317,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -4348,6 +4384,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5346,6 +5383,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5353,6 +5392,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5534,6 +5574,10 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -5541,6 +5585,7 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6071,6 +6116,8 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -6100,6 +6147,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6690,6 +6738,14 @@ Download and extract it somewhere convenient: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -6710,6 +6766,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7273,6 +7330,12 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -7286,6 +7349,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7388,10 +7452,13 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -9033,12 +9100,19 @@ Download and extract it somewhere convenient: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9634,6 +9708,13 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +Download and extract it somewhere convenient: +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: bash @@ -9713,6 +9794,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -10435,11 +10517,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -11038,6 +11123,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11057,6 +11146,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -11602,9 +11692,15 @@ Download and extract it somewhere convenient: >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -11807,6 +11903,12 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -11819,6 +11921,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -11921,9 +12024,12 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -13790,6 +13896,14 @@ Download and extract it somewhere convenient: ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main $ tar xvf geomesa-kafka_${VERSION}-bin.tar.gz $ cd geomesa-kafka_${VERSION} ======= @@ -13804,6 +13918,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13852,6 +13967,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -13914,6 +14031,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14904,10 +15022,13 @@ Download and extract it somewhere convenient: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= +<<<<<<< HEAD ======= ======= >>>>>>> 0fc6650ecf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15043,6 +15164,11 @@ Download and extract it somewhere convenient: ======= >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15050,6 +15176,7 @@ Download and extract it somewhere convenient: >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15057,10 +15184,13 @@ Download and extract it somewhere convenient: >>>>>>> 82d93995e4 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -15111,6 +15241,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main $ tar xvf geomesa-kafka_${VERSION}-bin.tar.gz $ cd geomesa-kafka_${VERSION} @@ -15126,6 +15260,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -15423,11 +15558,29 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -15435,6 +15588,7 @@ Download and extract it somewhere convenient: ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15548,11 +15702,17 @@ Download and extract it somewhere convenient: >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17558,10 +17718,17 @@ Download and extract it somewhere convenient: >>>>>>> 1973f72e77 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main ======= $ tar xvf geomesa-kafka_${VERSION}-bin.tar.gz $ cd geomesa-kafka_${VERSION} >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD >>>>>>> 42e8565e9b (Merge branch 'feature/postgis-fixes') @@ -18650,6 +18817,8 @@ Download and extract it somewhere convenient: $ cd geomesa-kafka_${VERSION} >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main .. _kafka_install_source: @@ -18746,6 +18915,7 @@ To install the GeoMesa data store, extract the contents of the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ``geomesa-kafka-gs-plugin_${VERSION}-install.tar.gz`` file in ``geomesa-kafka_${VERSION}/dist/geoserver/`` >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -18865,6 +19035,11 @@ To install the GeoMesa data store, extract the contents of the ``geomesa-kafka-gs-plugin_${VERSION}-install.tar.gz`` file in ``geomesa-kafka_${VERSION}/dist/geoserver/`` >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +``geomesa-kafka-gs-plugin_${VERSION}-install.tar.gz`` file in ``geomesa-kafka_${VERSION}/dist/geoserver/`` +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main in the binary distribution or ``geomesa-kafka/geomesa-kafka-gs-plugin/target/`` in the source distribution into your GeoServer's ``lib`` directory: @@ -18892,6 +19067,7 @@ to match the target environment, and then run the script: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -18953,6 +19129,9 @@ to match the target environment, and then run the script: ======= ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main Ensure that the Scala version (either ``_2.11`` or ``_2.12``) of both GeoMesa and Kafka match to avoid compatibility issues. @@ -18988,6 +19167,7 @@ The specific JARs needed for some common configurations are listed below: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -19079,5 +19259,8 @@ The specific JARs needed for some common configurations are listed below: ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Restart GeoServer after the JARs are installed. diff --git a/docs/user/kafka/streams.rst b/docs/user/kafka/streams.rst index 0d7f45f46d0e..dd19ccae477b 100644 --- a/docs/user/kafka/streams.rst +++ b/docs/user/kafka/streams.rst @@ -94,6 +94,7 @@ __ https://kafka.apache.org/31/documentation/streams/developer-guide/dsl-api.htm <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -320,6 +321,9 @@ __ https://kafka.apache.org/31/documentation/streams/developer-guide/dsl-api.htm ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main .. code-block:: scala import org.apache.kafka.streams.scala.ImplicitConversions._ @@ -353,6 +357,7 @@ __ https://kafka.apache.org/31/documentation/streams/developer-guide/dsl-api.htm <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -386,6 +391,8 @@ __ https://kafka.apache.org/31/documentation/streams/developer-guide/dsl-api.htm >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main Write Example ------------- @@ -453,6 +460,7 @@ The following shows how to persist data back to a GeoMesa topic: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -673,6 +681,9 @@ The following shows how to persist data back to a GeoMesa topic: ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main .. code-block:: scala import org.apache.kafka.streams.scala.ImplicitConversions._ @@ -705,6 +716,7 @@ The following shows how to persist data back to a GeoMesa topic: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -738,6 +750,8 @@ The following shows how to persist data back to a GeoMesa topic: >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main Joins and Topic Partitioning ---------------------------- diff --git a/docs/user/kudu/install.rst b/docs/user/kudu/install.rst index c90c0743638c..b3677f2287e9 100644 --- a/docs/user/kudu/install.rst +++ b/docs/user/kudu/install.rst @@ -16,6 +16,7 @@ Installing GeoMesa Kudu <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -214,6 +215,8 @@ Installing GeoMesa Kudu >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main .. note:: The examples below expect a version to be set in the environment: @@ -232,6 +235,7 @@ Installing GeoMesa Kudu <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -493,6 +497,8 @@ Installing GeoMesa Kudu >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main Installing the Binary Distribution ---------------------------------- @@ -567,6 +573,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2298,10 +2305,13 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a910ae135f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -3054,16 +3064,23 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> e3976d40bc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -3075,17 +3092,21 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f9e8439b09 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 82d93995e4 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -3094,6 +3115,8 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3101,6 +3124,7 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -3676,9 +3700,12 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) Download and extract it somewhere convenient: ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> c82dea9d29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3788,6 +3815,8 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: ======= >>>>>>> 49a5a0454f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main .. note:: In the following examples, replace ``${TAG}`` with the corresponding GeoMesa version (e.g. |release_version|), and @@ -3807,6 +3836,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3953,6 +3983,8 @@ Extract it somewhere convenient: ======= >>>>>>> bc73cc4d41 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -3999,6 +4031,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4577,11 +4610,14 @@ Extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -4691,6 +4727,8 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -4698,6 +4736,7 @@ Extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5091,6 +5130,8 @@ Extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -5115,6 +5156,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4524373ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5539,6 +5581,11 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main +======= Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -5551,6 +5598,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -5619,11 +5667,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5745,6 +5796,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5752,6 +5805,7 @@ Download and extract it somewhere convenient: >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5762,6 +5816,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= Download and extract it somewhere convenient: @@ -5769,6 +5825,7 @@ Download and extract it somewhere convenient: >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -5784,6 +5841,9 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5796,6 +5856,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0c734cda2b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -7860,6 +7921,13 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +Download and extract it somewhere convenient: +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: bash @@ -7933,6 +8001,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -8819,11 +8888,14 @@ Download and extract it somewhere convenient: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8837,6 +8909,9 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -8845,6 +8920,7 @@ Download and extract it somewhere convenient: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8862,6 +8938,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -8874,10 +8952,13 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -8887,6 +8968,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9646,6 +9728,10 @@ Download and extract it somewhere convenient: >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main $ ls bin/ conf/ dist/ docs/ examples/ lib/ LICENSE.txt logs/ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9688,6 +9774,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -10261,11 +10348,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -10384,6 +10474,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -10391,6 +10483,7 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10784,6 +10877,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10806,6 +10901,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4524373ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -11154,11 +11250,14 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -11300,11 +11399,16 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -11426,6 +11530,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11433,6 +11539,7 @@ Download and extract it somewhere convenient: >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11443,12 +11550,15 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD ======= @@ -11464,6 +11574,9 @@ Download and extract it somewhere convenient: ======= >>>>>>> locationtech-main ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11476,6 +11589,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0c734cda2b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -13791,6 +13905,12 @@ Download and extract it somewhere convenient: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. _kudu_install_source: @@ -13858,6 +13978,7 @@ Test the command that invokes the GeoMesa Tools: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13994,6 +14115,8 @@ Test the command that invokes the GeoMesa Tools: ======= >>>>>>> 8dec77199d (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main .. code-block:: bash $ bin/geomesa-kudu @@ -14003,6 +14126,7 @@ The output should look like this:: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -14319,6 +14443,8 @@ The output should look like this:: The output should look like this:: >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main INFO Usage: geomesa-kudu [command] [command options] Commands: ... diff --git a/docs/user/lambda/install.rst b/docs/user/lambda/install.rst index 39e72498c5f0..e7028d44c9f0 100644 --- a/docs/user/lambda/install.rst +++ b/docs/user/lambda/install.rst @@ -13,6 +13,7 @@ Installing GeoMesa Lambda <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -79,6 +80,8 @@ Installing GeoMesa Lambda >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main ======= # note: |scala_binary_version| is the Scala build version $ export VERSION="|scala_binary_version|-${TAG}" @@ -86,6 +89,7 @@ Installing GeoMesa Lambda <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -147,6 +151,8 @@ Installing GeoMesa Lambda >>>>>>> locationtech-main ======= >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main Installing from the Binary Distribution --------------------------------------- @@ -230,6 +236,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -952,11 +959,14 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1555,6 +1565,10 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1574,6 +1588,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2119,9 +2134,15 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -2324,6 +2345,12 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -2336,6 +2363,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2438,9 +2466,12 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4317,6 +4348,14 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Download and extract it somewhere convenient: ======= .. note:: @@ -4328,6 +4367,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4379,6 +4419,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -4444,6 +4486,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5442,6 +5485,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5449,6 +5494,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5630,6 +5676,10 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -5637,6 +5687,7 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6167,6 +6218,8 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -6196,6 +6249,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6786,6 +6840,14 @@ Download and extract it somewhere convenient: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -6806,6 +6868,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7369,6 +7432,12 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -7382,6 +7451,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7484,10 +7554,13 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -9129,12 +9202,19 @@ Download and extract it somewhere convenient: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9730,6 +9810,13 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +Download and extract it somewhere convenient: +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: bash @@ -9811,6 +9898,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -10963,22 +11051,30 @@ Download and extract it somewhere convenient: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f7cef54062 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15564,6 +15660,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -15602,6 +15700,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -15672,6 +15771,10 @@ Download and extract it somewhere convenient: >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15690,6 +15793,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6eb31fb652 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> ffe4f9fd41 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15733,11 +15837,18 @@ Download and extract it somewhere convenient: >>>>>>> b4c1ea8881 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154a (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 9c39003417 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15786,8 +15897,15 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD >>>>>>> 0fbf9e83e2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 17c1f8a18c (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -15912,8 +16030,13 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 9a4dff9e4f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -15929,9 +16052,14 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 2586fa6a40 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16214,6 +16342,8 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> locationtech-main +======= ======= $ ls bin/ conf/ dist/ docs/ examples/ lib/ LICENSE.txt logs/ @@ -16221,6 +16351,7 @@ Download and extract it somewhere convenient: >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d94c03a98e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16695,6 +16826,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. _lambda_install_source: @@ -16814,6 +16949,7 @@ To install the GeoMesa data store, extract the contents of the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ``geomesa-lambda-gs-plugin_${VERSION}-install.tar.gz`` file in ``geomesa-lambda_${VERSION}/dist/geoserver/`` >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16933,6 +17069,11 @@ To install the GeoMesa data store, extract the contents of the ``geomesa-lambda-gs-plugin_${VERSION}-install.tar.gz`` file in ``geomesa-lambda_${VERSION}/dist/geoserver/`` >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +``geomesa-lambda-gs-plugin_${VERSION}-install.tar.gz`` file in ``geomesa-lambda_${VERSION}/dist/geoserver/`` +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main in the binary distribution or ``geomesa-lambda/geomesa-lambda-gs-plugin/target/`` in the source distribution into your GeoServer's ``lib`` directory: @@ -16957,6 +17098,7 @@ to match the target environment, and then run the script: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17018,6 +17160,9 @@ to match the target environment, and then run the script: ======= ======= >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +======= +>>>>>>> locationtech-main .. warning:: Due to a classpath conflict with GeoServer, the version of Accumulo client JARs installed must be 1.9.2 or later. @@ -17068,6 +17213,7 @@ Kafka 0.9.0.1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= <<<<<<< HEAD @@ -17159,6 +17305,9 @@ Kafka 0.9.0.1 ======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main Restart GeoServer after the JARs are installed. .. _install_geomesa_process_lambda: diff --git a/docs/user/redis/install.rst b/docs/user/redis/install.rst index 6aad03f7527e..9bebd9287d2e 100644 --- a/docs/user/redis/install.rst +++ b/docs/user/redis/install.rst @@ -17,6 +17,7 @@ Installing GeoMesa Redis <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main $ export VERSION="|scala_binary_version|-${TAG}" # note: |scala_binary_version| is the Scala build version @@ -124,6 +125,13 @@ Installing GeoMesa Redis $ export VERSION="|scala_binary_version|-${TAG}" >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> baeb44a4a8 (GEOMESA-3176 Docs - fix download links in install instructions) +======= + $ export VERSION="|scala_binary_version|-${TAG}" # note: |scala_binary_version| is the Scala build version +======= + # note: |scala_binary_version| is the Scala build version + $ export VERSION="|scala_binary_version|-${TAG}" +>>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main Installing the Binary Distribution ---------------------------------- @@ -207,6 +215,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) @@ -929,11 +938,14 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1532,6 +1544,10 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> a85aff60b3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1551,6 +1567,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2096,9 +2113,15 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> d4c5768cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -2301,6 +2324,12 @@ __ https://github.com/locationtech/geomesa/releases >>>>>>> locationtech-main ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -2313,6 +2342,7 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a6a96234b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2415,9 +2445,12 @@ __ https://github.com/locationtech/geomesa/releases <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> df644ff83d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4294,6 +4327,14 @@ __ https://github.com/locationtech/geomesa/releases ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main Download and extract it somewhere convenient: ======= .. note:: @@ -4305,6 +4346,7 @@ Extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4356,6 +4398,8 @@ Download and extract it somewhere convenient: <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -4421,6 +4465,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -5419,6 +5464,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5426,6 +5473,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -5607,6 +5655,10 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -5614,6 +5666,7 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6144,6 +6197,8 @@ Download and extract it somewhere convenient: >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -6173,6 +6228,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6763,6 +6819,14 @@ Download and extract it somewhere convenient: >>>>>>> 4492950388 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -6783,6 +6847,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7346,6 +7411,12 @@ Download and extract it somewhere convenient: >>>>>>> locationtech-main ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= Download and extract it somewhere convenient: >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -7359,6 +7430,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4d9f87a514 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -7461,10 +7533,13 @@ Download and extract it somewhere convenient: <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a0befba4ce (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -9106,12 +9181,19 @@ Download and extract it somewhere convenient: ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9707,6 +9789,13 @@ Download and extract it somewhere convenient: Download and extract it somewhere convenient: >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +Download and extract it somewhere convenient: +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. code-block:: bash @@ -9788,6 +9877,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46c05fed5 (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -10940,22 +11030,30 @@ Download and extract it somewhere convenient: ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f7cef54062 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15541,6 +15639,8 @@ Download and extract it somewhere convenient: ======= >>>>>>> f2943650ff (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= @@ -15579,6 +15679,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -15649,6 +15750,10 @@ Download and extract it somewhere convenient: >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15667,6 +15772,7 @@ Download and extract it somewhere convenient: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6eb31fb652 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> ffe4f9fd41 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15710,11 +15816,18 @@ Download and extract it somewhere convenient: >>>>>>> b4c1ea8881 (GEOMESA-3176 Docs - fix download links in install instructions) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 90ec70f55 (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 63db7d154a (GEOMESA-3176 Docs - fix download links in install instructions) <<<<<<< HEAD >>>>>>> 9c39003417 (GEOMESA-3176 Docs - fix download links in install instructions) @@ -15763,8 +15876,15 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 16b2e83f2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 15e998504 (GEOMESA-3176 Docs - fix download links in install instructions) +<<<<<<< HEAD >>>>>>> 0fbf9e83e2 (GEOMESA-3176 Docs - fix download links in install instructions) >>>>>>> 17c1f8a18c (GEOMESA-3176 Docs - fix download links in install instructions) ======= @@ -15889,8 +16009,13 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 9a4dff9e4f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -15906,9 +16031,14 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> 63db7d154 (GEOMESA-3176 Docs - fix download links in install instructions) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 2586fa6a40 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16191,6 +16321,8 @@ Download and extract it somewhere convenient: ======= ======= ======= +>>>>>>> locationtech-main +======= ======= $ ls bin/ conf/ dist/ docs/ examples/ lib/ LICENSE.txt logs/ @@ -16198,6 +16330,7 @@ Download and extract it somewhere convenient: >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d94c03a98e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16672,6 +16805,10 @@ Download and extract it somewhere convenient: ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main .. _redis_install_source: diff --git a/docs/user/spark/spark_jts.rst b/docs/user/spark/spark_jts.rst index 9155b4ab4c5b..903ffcf2f5c2 100644 --- a/docs/user/spark/spark_jts.rst +++ b/docs/user/spark/spark_jts.rst @@ -29,6 +29,7 @@ This functionality is located in the ``geomesa-spark/geomesa-spark-jts`` module: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -95,6 +96,8 @@ This functionality is located in the ``geomesa-spark/geomesa-spark-jts`` module: >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main ======= geomesa-spark-jts_2.12 // version, etc. @@ -102,6 +105,7 @@ This functionality is located in the ``geomesa-spark/geomesa-spark-jts`` module: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -163,6 +167,8 @@ This functionality is located in the ``geomesa-spark/geomesa-spark-jts`` module: >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main Example diff --git a/docs/user/upgrade.rst b/docs/user/upgrade.rst index f0244edbe3b8..be5b446b4fc0 100644 --- a/docs/user/upgrade.rst +++ b/docs/user/upgrade.rst @@ -94,6 +94,7 @@ Compatibility Matrix <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -131,6 +132,8 @@ Compatibility Matrix >>>>>>> locationtech-main ======= >>>>>>> a97cb0164e (Add note on NiFi scala version to upgrade guide) +======= +>>>>>>> locationtech-main Version 4.1.0 Upgrade Guide +++++++++++++++++++++++++++ @@ -148,6 +151,7 @@ The following classes have been deprecated and will be removed in a future versi * org.locationtech.geomesa.kafka.confluent.SchemaParser.GeoMesaAvroDeserializableEnumProperty +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 16e5072a4a (Add note on NiFi scala version to upgrade guide) @@ -189,6 +193,8 @@ The following classes have been deprecated and will be removed in a future versi >>>>>>> d381f46e90 (Add note on NiFi scala version to upgrade guide) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main Partitioned PostGIS Prepared Statements --------------------------------------- @@ -196,6 +202,7 @@ If not specified, prepared statements now default to ``true`` in the partitione statements are generally faster on insert, and some attribute types (such as list-type attributes) are only supported through prepared statements. +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> 008807b427 (GEOMESA-3295 Partitioned PostGIS - default to using prepared statements (#2993)) ======= @@ -203,6 +210,11 @@ supported through prepared statements. <<<<<<< HEAD >>>>>>> 01f791d4aa (Add note on NiFi scala version to upgrade guide) >>>>>>> a97cb0164e (Add note on NiFi scala version to upgrade guide) +======= +======= +<<<<<<< HEAD +>>>>>>> 01f791d4aa (Add note on NiFi scala version to upgrade guide) +>>>>>>> locationtech-main Version 4.0.0 Upgrade Guide +++++++++++++++++++++++++++ @@ -789,6 +801,7 @@ Dependency Updates <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e6dd9b5b1 (Add note on NiFi scala version to upgrade guide) ======= @@ -883,6 +896,10 @@ Dependency Updates ======= >>>>>>> e6dd9b5b1 (Add note on NiFi scala version to upgrade guide) >>>>>>> a97cb0164e (Add note on NiFi scala version to upgrade guide) +======= +======= +>>>>>>> e6dd9b5b1 (Add note on NiFi scala version to upgrade guide) +>>>>>>> locationtech-main Version 3.3.0 Upgrade Guide +++++++++++++++++++++++++++ diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml index 56819248cfe8..7d124040bb56 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-datastore/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main geomesa-accumulo-datastore_2.12 diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloIndexAdapter.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloIndexAdapter.scala index aaaf5422f4e3..a8b7d6b61a29 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloIndexAdapter.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/data/AccumuloIndexAdapter.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.accumulo.data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -73,6 +74,9 @@ package org.locationtech.geomesa.accumulo.data ======= ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> locationtech-main import java.nio.charset.StandardCharsets import java.util.Collections import java.util.Map.Entry @@ -80,6 +84,7 @@ import java.util.Map.Entry <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD @@ -171,6 +176,9 @@ import java.util.Map.Entry ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import org.apache.accumulo.core.conf.Property import org.apache.accumulo.core.data.{Key, Mutation, Range, Value} import org.apache.accumulo.core.file.keyfunctor.RowFunctor diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoVisibilityRowEncoder.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoVisibilityRowEncoder.scala index 8d3f158c3273..0a6480159f08 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoVisibilityRowEncoder.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/main/scala/org/locationtech/geomesa/accumulo/iterators/KryoVisibilityRowEncoder.scala @@ -16,6 +16,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -24,6 +27,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -298,6 +302,8 @@ ======= <<<<<<< HEAD >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. * Portions Crown Copyright (c) 2016-2022 Dstl ======= @@ -309,6 +315,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e980963df (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= <<<<<<< HEAD @@ -810,6 +817,8 @@ >>>>>>> locationtech-main ======= ======= +======= +>>>>>>> locationtech-main >>>>>>> e980963df (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= ======= @@ -817,6 +826,7 @@ * Portions Crown Copyright (c) 2016-2022 Dstl >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> 1b25d7ddb (Merge branch 'feature/postgis-fixes') >>>>>>> 699117eca9 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD @@ -846,6 +856,8 @@ >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -928,7 +940,10 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> locationtech-main ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') // Calculate length of serialised attributes, excluding attribute values themselves @@ -939,6 +954,7 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { 1 * 4 + // user data offset (will use 4 bytes) IntBitSet.size(count) * 4 // null bit set, written in units of ints +<<<<<<< HEAD >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -1605,6 +1621,10 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { ======= ======= >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +======= +<<<<<<< HEAD +======= +>>>>>>> locationtech-main // Calculate length of serialised attributes, excluding attribute values themselves var length = 1 + // version @@ -1617,6 +1637,7 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2078,6 +2099,11 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main // Tracks our output position for copying attribute value bytes // Begins immediately after the above var valueCursor = length @@ -2102,6 +2128,7 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2415,6 +2442,8 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main val key = keys.get(i) key.getColumnQualifier.getBytes.foreach { unsigned => ======= @@ -2422,6 +2451,7 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2867,11 +2897,15 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { >>>>>>> 6b41bcc08d (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +>>>>>>> locationtech-main ======= val key = keys.get(i) key.getColumnQualifier.getBytes.foreach { unsigned => >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD >>>>>>> 42e8565e9b (Merge branch 'feature/postgis-fixes') @@ -2965,6 +2999,8 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main val index = java.lang.Byte.toUnsignedInt(unsigned) if(!metadata.nulls.contains(index)) { val pos = metadata.setPosition(index) @@ -2984,6 +3020,7 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e8cc4971c6 (Merge branch 'feature/postgis-fixes') ======= @@ -3358,10 +3395,15 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { ======= attributeVis(index) = key.getColumnVisibility.toString ======= +======= + attributeVis(index) = key.getColumnVisibility.toString +======= +>>>>>>> locationtech-main >>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= attributeVis(index) = key.getColumnVisibility.toString >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= <<<<<<< HEAD @@ -3639,6 +3681,8 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { attributeVis(index) = key.getColumnVisibility.toString >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main length += len } } @@ -3687,6 +3731,7 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4000,6 +4045,8 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main // reset for next time through with new keys/values attributes(i) = null attributeVis(i) = "" @@ -4008,6 +4055,7 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4180,6 +4228,9 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { >>>>>>> locationtech-main ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +>>>>>>> locationtech-main ======= // reset for next time through with new keys/values attributes(i) = null @@ -4187,6 +4238,7 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4537,6 +4589,9 @@ class KryoVisibilityRowEncoder extends RowEncodingIterator { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main i += 1 } output.writeInt(valueCursor - 4) // user-data offset. Note no user data has actually been copied in. diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreJsonTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreJsonTest.scala index 46349697d562..27a3ed5c78fd 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreJsonTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreJsonTest.scala @@ -78,6 +78,7 @@ class AccumuloDataStoreJsonTest extends Specification with TestWithFeatureType { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -134,6 +135,9 @@ class AccumuloDataStoreJsonTest extends Specification with TestWithFeatureType { ======= ======= >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +======= +>>>>>>> locationtech-main val features = SelfClosingIterator(ds.getFeatureReader(query, Transaction.AUTO_COMMIT)).toList features must haveLength(1) features.head.getID mustEqual "4" @@ -143,6 +147,7 @@ class AccumuloDataStoreJsonTest extends Specification with TestWithFeatureType { val query = new Query(sftName, Filter.INCLUDE, Array("geom", """"$.json.properties.characteristics.height"""")) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD val features = SelfClosingIterator(ds.getFeatureReader(query, Transaction.AUTO_COMMIT)).toList >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) @@ -242,6 +247,10 @@ class AccumuloDataStoreJsonTest extends Specification with TestWithFeatureType { val features = SelfClosingIterator(ds.getFeatureReader(query, Transaction.AUTO_COMMIT)).toList >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= + val features = SelfClosingIterator(ds.getFeatureReader(query, Transaction.AUTO_COMMIT)).toList +>>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +>>>>>>> locationtech-main features must haveLength(5) features.map(_.getAttribute(1)) must containTheSameElementsAs(Seq("20", "30", null, null, null)) } @@ -251,6 +260,7 @@ class AccumuloDataStoreJsonTest extends Specification with TestWithFeatureType { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= val query = new Query(sftName, Filter.INCLUDE, Array("geom", """"$.json[1]"""")) >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) @@ -370,6 +380,11 @@ class AccumuloDataStoreJsonTest extends Specification with TestWithFeatureType { val query = new Query(sftName, Filter.INCLUDE, Array("geom", """"$.json[1]"""")) >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +======= + val query = new Query(sftName, Filter.INCLUDE, Array("geom", """"$.json[1]"""")) +>>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +>>>>>>> locationtech-main val features = SelfClosingIterator(ds.getFeatureReader(query, Transaction.AUTO_COMMIT)).toList features must haveLength(5) features.map(_.getAttribute(1)) must containTheSameElementsAs(Seq(null, null, null, null, "a2")) diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreNullAttributeVisibilityTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreNullAttributeVisibilityTest.scala index 07eb888a4389..a1bcdb8a572a 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreNullAttributeVisibilityTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/data/AccumuloDataStoreNullAttributeVisibilityTest.scala @@ -16,6 +16,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Crown Copyright (c) 2016-2023 Dstl @@ -23,6 +26,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -445,6 +449,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Crown Copyright (c) 2016-2022 Dstl ======= * Crown Copyright (c) 2016-2021 Dstl @@ -452,6 +458,7 @@ <<<<<<< HEAD >>>>>>> e980963df (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3a3424a161 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) <<<<<<< HEAD <<<<<<< HEAD @@ -466,12 +473,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Crown Copyright (c) 2016-2022 Dstl >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -812,6 +822,8 @@ >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -843,6 +855,7 @@ class AccumuloDataStoreNullAttributeVisibilityTest extends TestWithFeatureType { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import scala.collection.JavaConversions._ >>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) @@ -962,6 +975,11 @@ class AccumuloDataStoreNullAttributeVisibilityTest extends TestWithFeatureType { import scala.collection.JavaConversions._ >>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +======= +======= + import scala.collection.JavaConversions._ +>>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +>>>>>>> locationtech-main sequential @@ -1004,6 +1022,7 @@ class AccumuloDataStoreNullAttributeVisibilityTest extends TestWithFeatureType { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= val ds = DataStoreFinder.getDataStore(dsParams ++ Map(AccumuloDataStoreParams.AuthsParam.key -> auths)).asInstanceOf[AccumuloDataStore] >>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) @@ -1123,6 +1142,11 @@ class AccumuloDataStoreNullAttributeVisibilityTest extends TestWithFeatureType { val ds = DataStoreFinder.getDataStore(dsParams ++ Map(AccumuloDataStoreParams.AuthsParam.key -> auths)).asInstanceOf[AccumuloDataStore] >>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) >>>>>>> d15e309d98 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +======= +======= + val ds = DataStoreFinder.getDataStore(dsParams ++ Map(AccumuloDataStoreParams.AuthsParam.key -> auths)).asInstanceOf[AccumuloDataStore] +>>>>>>> e5f251e08 (GEOMESA-3091 Attribute level visibilities error with null attribute values (#2775)) +>>>>>>> locationtech-main val query = new Query(sftName, ECQL.toFilter(filter)) SelfClosingIterator(ds.getFeatureReader(query, Transaction.AUTO_COMMIT)).toSeq } diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/ArrowMultiPointTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/ArrowMultiPointTest.scala index 7096f2a490d9..2ac2ff676a3b 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/ArrowMultiPointTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/ArrowMultiPointTest.scala @@ -54,6 +54,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -740,12 +741,18 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= + * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. +======= +<<<<<<< HEAD +>>>>>>> locationtech-main ======= ======= >>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -753,6 +760,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 76618c8da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -766,6 +775,7 @@ >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD @@ -1265,6 +1275,8 @@ >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1294,6 +1306,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1328,11 +1341,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> c5e182765 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1352,6 +1369,8 @@ >>>>>>> c3c5dd0ebb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1368,6 +1387,7 @@ <<<<<<< HEAD >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 338d952d43 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -1406,9 +1426,12 @@ <<<<<<< HEAD >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 23c0241798 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1424,12 +1447,18 @@ >>>>>>> 76618c8da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +>>>>>>> 76618c8da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a910ae135f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 92674ff9d4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1450,11 +1479,16 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> c8a325e13 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -1463,6 +1497,7 @@ >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD >>>>>>> 2586fa6a40 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> c8a325e13 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -1516,6 +1551,10 @@ >>>>>>> 2654d9c120 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b9c0fc77b9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= @@ -1531,6 +1570,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1801,6 +1841,8 @@ >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> d9ed077cd (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -1832,6 +1874,7 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -1913,6 +1956,8 @@ >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> b1c506839 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1924,6 +1969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5e182765 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -1971,19 +2017,32 @@ <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> c5e182765 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> c8a325e13 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1992,6 +2051,8 @@ ======= >>>>>>> 9a4dff9e4f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2000,6 +2061,7 @@ >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 23c0241798 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2010,6 +2072,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2018,6 +2082,7 @@ >>>>>>> 76618c8da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a910ae135f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2028,10 +2093,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -2047,6 +2115,9 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2055,6 +2126,7 @@ >>>>>>> c8a325e13 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2065,12 +2137,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2081,12 +2156,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bdbced26d4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2097,6 +2175,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') @@ -2104,6 +2184,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= @@ -5975,6 +6056,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -5987,13 +6070,17 @@ package org.locationtech.geomesa.accumulo.iterators <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= import java.io.{ByteArrayInputStream, ByteArrayOutputStream} >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6112,6 +6199,8 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream} >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging import org.apache.arrow.memory.BufferAllocator import org.apache.arrow.vector.DirtyRootAllocator @@ -6120,6 +6209,7 @@ import org.geotools.data.{Query, Transaction} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.geotools.filter.text.ecql.ECQL >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -6239,6 +6329,11 @@ import org.geotools.filter.text.ecql.ECQL import org.geotools.filter.text.ecql.ECQL >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +import org.geotools.filter.text.ecql.ECQL +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main import org.junit.runner.RunWith import org.locationtech.geomesa.accumulo.TestWithFeatureType import org.locationtech.geomesa.arrow.io.SimpleFeatureArrowFileReader @@ -6250,6 +6345,7 @@ import org.locationtech.geomesa.utils.io.WithClose <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.jts.geom.{MultiPoint, Point} >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -6369,6 +6465,11 @@ import org.locationtech.jts.geom.{MultiPoint, Point} import org.locationtech.jts.geom.{MultiPoint, Point} >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +import org.locationtech.jts.geom.{MultiPoint, Point} +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main import org.opengis.filter.Filter import org.specs2.mock.Mockito import org.specs2.runner.JUnitRunner @@ -6379,6 +6480,7 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6491,6 +6593,10 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream} ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main @RunWith(classOf[JUnitRunner]) class ArrowMultiPointTest extends TestWithFeatureType with Mockito with LazyLogging { @@ -6515,6 +6621,7 @@ class ArrowMultiPointTest extends TestWithFeatureType with Mockito with LazyLogg <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= val query = new Query(sft.getTypeName, Filter.INCLUDE, Array("name", "dtg", "geom")) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -6634,6 +6741,11 @@ class ArrowMultiPointTest extends TestWithFeatureType with Mockito with LazyLogg val query = new Query(sft.getTypeName, Filter.INCLUDE, Array("name", "dtg", "geom")) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + val query = new Query(sft.getTypeName, Filter.INCLUDE, Array("name", "dtg", "geom")) +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main query.getHints.put(QueryHints.ARROW_ENCODE, true) query.getHints.put(QueryHints.ARROW_BATCH_SIZE, 100) query.getHints.put(QueryHints.ARROW_DICTIONARY_FIELDS, "name") diff --git a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/DtgAgeOffTest.scala b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/DtgAgeOffTest.scala index 57c667d01a0a..9f02d58db04a 100644 --- a/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/DtgAgeOffTest.scala +++ b/geomesa-accumulo/geomesa-accumulo-datastore/src/test/scala/org/locationtech/geomesa/accumulo/iterators/DtgAgeOffTest.scala @@ -13,6 +13,7 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -61,6 +62,9 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken ======= ======= >>>>>>> 00666f6bff (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) +======= +======= +>>>>>>> locationtech-main import java.time.{ZoneOffset, ZonedDateTime} import java.util.{Collections, Date} @@ -68,6 +72,7 @@ import org.apache.accumulo.core.client.Connector <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) ======= <<<<<<< HEAD @@ -148,6 +153,9 @@ import org.apache.accumulo.core.client.Connector ======= >>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) >>>>>>> 00666f6bff (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) +======= +>>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) +>>>>>>> locationtech-main import org.geotools.data.{DataStore, DataStoreFinder} import org.junit.runner.RunWith import org.locationtech.geomesa.accumulo.data.AccumuloDataStoreParams @@ -246,6 +254,7 @@ class DtgAgeOffTest extends Specification with TestWithFeatureType { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= val conn: Connector = MiniCluster.cluster.getConnector(MiniCluster.Users.root.name, MiniCluster.Users.root.password) >>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) @@ -346,6 +355,11 @@ class DtgAgeOffTest extends Specification with TestWithFeatureType { val conn: Connector = MiniCluster.cluster.getConnector(MiniCluster.Users.root.name, MiniCluster.Users.root.password) >>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) >>>>>>> 00666f6bff (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) +======= +======= + val conn: Connector = MiniCluster.cluster.getConnector(MiniCluster.Users.root.name, MiniCluster.Users.root.password) +>>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) +>>>>>>> locationtech-main conn.tableOperations().list().asScala.filter(t => t.contains("DtgAgeOffTest_DtgAgeOffTest")).forall { tableName => val scanner = conn.createScanner(tableName, MiniCluster.Users.root.auths) val count = scanner.asScala.size @@ -357,6 +371,7 @@ class DtgAgeOffTest extends Specification with TestWithFeatureType { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) ======= @@ -451,5 +466,9 @@ class DtgAgeOffTest extends Specification with TestWithFeatureType { ======= >>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) >>>>>>> 00666f6bff (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) +======= +======= +>>>>>>> 1ec19b5aa (GEOMESA-3062 DtgAgeOff Filter does not work properly with join indexes (#2756)) +>>>>>>> locationtech-main } } diff --git a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml index 677c4d814196..b8361c00224b 100644 --- a/geomesa-accumulo/geomesa-accumulo-dist/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-dist/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml index 366bfe23d990..f71655d58129 100644 --- a/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-distributed-runtime/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main geomesa-accumulo-distributed-runtime_2.12 diff --git a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml index c25101ac4e01..33e871e47b10 100644 --- a/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-gs-plugin/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml index 8d514e1d0e05..c5246036db8b 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-jobs/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala index 56ec68f403d1..adcb44ee1f46 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +++ b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala @@ -41,6 +41,7 @@ package org.locationtech.geomesa.accumulo.jobs.mapreduce <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= package org.locationtech.geomesa.jobs.mapreduce >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala @@ -160,6 +161,11 @@ package org.locationtech.geomesa.jobs.mapreduce package org.locationtech.geomesa.jobs.mapreduce >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +======= +package org.locationtech.geomesa.jobs.mapreduce +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging import org.apache.accumulo.core.client.IteratorSetting.Column @@ -191,6 +197,7 @@ import java.util.{Collections, Properties} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -252,6 +259,9 @@ import java.util.{Collections, Properties} ======= ======= >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +======= +>>>>>>> locationtech-main import java.nio.charset.StandardCharsets import java.util.AbstractMap.SimpleImmutableEntry import java.util.Collections @@ -259,6 +269,7 @@ import java.util.Map.Entry <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala ======= <<<<<<< HEAD @@ -350,6 +361,9 @@ import java.util.Map.Entry ======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> locationtech-main import scala.collection.mutable.ArrayBuffer /** @@ -466,6 +480,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -851,9 +866,29 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> locationtech-main ======= +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +======= +<<<<<<< HEAD +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +======= +<<<<<<< HEAD +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +======= +<<<<<<< HEAD +>>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> locationtech-main +======= <<<<<<< HEAD >>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala ======= +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1896,6 +1931,10 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= ======= <<<<<<< HEAD +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> locationtech-main +======= +<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD @@ -1903,29 +1942,36 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> ea0c690e2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2671cb8522 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> 8bba68fcaf (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eb01a83daf (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> ee8e40a0aa (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 74c6b7f8d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +<<<<<<< HEAD >>>>>>> f8af85bf92 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> fadddae75b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -2455,6 +2501,8 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 74c6b7f8d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> 30b076b423 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main // all accumulo input config methods requires a job // assertion: only the JobConf is updated - to get credentials pass in a JobConf instead of Configuration ======= @@ -2468,6 +2516,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala ======= >>>>>>> a8ce2896d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -2479,6 +2528,8 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala ======= >>>>>>> 1a79caee45 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala @@ -2489,6 +2540,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4966,12 +5018,18 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> b51333ce3c (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +======= + // all accumulo input config methods requires a job + // assertion: only the JobConf is updated - to get credentials pass in a JobConf instead of Configuration +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> locationtech-main ======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD >>>>>>> a8ce2896de (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -4980,6 +5038,9 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= ======= ======= +>>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> locationtech-main +======= ======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala ======= @@ -5001,6 +5062,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f9397984eb (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 917dff0811 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -5008,12 +5070,15 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= // assertion: all accumulo input config requires a job, but really just updates the job conf >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 3baf74fa6 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c4bc2d77a8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> 098897eb4d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -5038,9 +5103,17 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= ======= ======= +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> locationtech-main +======= +======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> ea0c690e2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2671cb8522 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> 8bba68fcaf (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -5612,6 +5685,8 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> 4ccd502749 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD <<<<<<< HEAD ======= @@ -5621,9 +5696,12 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/accumulo/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 254d97a0a7 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> locationtech-main ======= @@ -5632,7 +5710,10 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> 3baf74fa6 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 74c6b7f8d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +<<<<<<< HEAD >>>>>>> 30b076b423 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main val job = new Job(conf) job.setInputFormatClass(classOf[GeoMesaAccumuloInputFormat]) @@ -5670,6 +5751,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5731,6 +5813,9 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= ======= >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +======= +>>>>>>> locationtech-main // note: for Kerberos, this will create a DelegationToken for us and add it to the Job credentials AbstractInputFormat.setConnectorInfo(job, user, token) @@ -5738,6 +5823,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala ======= <<<<<<< HEAD @@ -5829,6 +5915,9 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +>>>>>>> locationtech-main // use the query plan to set the accumulo input format options require(plan.tables.lengthCompare(1) == 0, s"Can only query from a single table: ${plan.tables.mkString(", ")}") diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/mapreduce/GeoMesaAccumuloFileOutputFormat.scala b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/mapreduce/GeoMesaAccumuloFileOutputFormat.scala index 40a93fbfa79a..ee99fd8ec215 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/mapreduce/GeoMesaAccumuloFileOutputFormat.scala +++ b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/mapreduce/GeoMesaAccumuloFileOutputFormat.scala @@ -31,6 +31,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -798,6 +799,8 @@ >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. ======= <<<<<<< HEAD @@ -805,6 +808,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1555,6 +1559,13 @@ ======= >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -1581,6 +1592,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2025,6 +2037,8 @@ >>>>>>> locationtech-main ======= >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -2040,6 +2054,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 62ac58128c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -2979,6 +2994,13 @@ * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= + * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/mapreduce/package.scala b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/mapreduce/package.scala index 5c2918926cb9..e9ffc943199a 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/mapreduce/package.scala +++ b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/accumulo/mapreduce/package.scala @@ -31,6 +31,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -798,6 +799,8 @@ >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. ======= <<<<<<< HEAD @@ -805,6 +808,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1555,6 +1559,13 @@ ======= >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -1581,6 +1592,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2025,6 +2037,8 @@ >>>>>>> locationtech-main ======= >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -2040,6 +2054,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 62ac58128c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -2979,6 +2994,13 @@ * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= + * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at diff --git a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala index c7a05c141594..c961b2059285 100644 --- a/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala +++ b/geomesa-accumulo/geomesa-accumulo-jobs/src/main/scala/org/locationtech/geomesa/jobs/mapreduce/GeoMesaAccumuloInputFormat.scala @@ -209,6 +209,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= @@ -1004,6 +1005,9 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> a773c6ef65 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -1024,6 +1028,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -1127,6 +1132,10 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> locationtech-main ======= ======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> ea0c690e2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD @@ -1137,6 +1146,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1225,6 +1235,11 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -1241,6 +1256,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2670,12 +2686,18 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> 8a2d3cfac9 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= +>>>>>>> 76328bb49 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 02ddf6ca4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a358de35a8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> 08ee2fed57 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -2684,12 +2706,15 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 44b15e96d9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 813cf035d0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -3282,6 +3307,8 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> 8a2d3cfac9 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main // all accumulo input config methods requires a job // assertion: only the JobConf is updated - to get credentials pass in a JobConf instead of Configuration ======= @@ -3340,6 +3367,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -4294,6 +4322,9 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> ea5f19f56b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -4306,6 +4337,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -4380,6 +4412,8 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> abc395c346 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> ea0c690e2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= @@ -4397,6 +4431,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5314,10 +5349,17 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 02ddf6ca4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 44b15e96d9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 813cf035d0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -8118,6 +8160,8 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> 0b22bfaa87 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1506607bc9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // all accumulo input config methods requires a job // assertion: only the JobConf is updated - to get credentials pass in a JobConf instead of Configuration @@ -8137,6 +8181,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1d4e479464 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -8783,6 +8828,11 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> a1ccc017c6 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 74c6b7f8d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -8792,6 +8842,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7abafecb1 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 1468e59829 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -8807,6 +8858,10 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= >>>>>>> 4bd5ce922d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +>>>>>>> 74c6b7f8d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main ======= // assertion: all accumulo input config requires a job, but really just updates the job conf @@ -8815,6 +8870,7 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7ef22a4bb (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> c8d3361f41 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -9086,11 +9142,30 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> 8a2d3cfac9 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= +>>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> ea0c690e2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 74c6b7f8d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 76328bb49 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 02ddf6ca4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a358de35a8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> 08ee2fed57 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -9107,11 +9182,16 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { ======= ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main ======= // all accumulo input config methods requires a job // assertion: only the JobConf is updated - to get credentials pass in a JobConf instead of Configuration >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD >>>>>>> 42e8565e9b (Merge branch 'feature/postgis-fixes') @@ -9932,6 +10012,8 @@ object GeoMesaAccumuloInputFormat extends LazyLogging { >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main val job = new Job(conf) job.setInputFormatClass(classOf[GeoMesaAccumuloInputFormat]) diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo1/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo1/pom.xml index d3f217d8d923..1d3e2d49be2a 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo1/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo1/pom.xml @@ -47,6 +47,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -347,6 +348,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -357,6 +360,7 @@ ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -366,12 +370,17 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -810,6 +819,8 @@ >>>>>>> locationtech-main ======= ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -819,6 +830,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -884,12 +896,17 @@ >>>>>>> 24218aa338 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1138,6 +1155,8 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -1145,17 +1164,21 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> b2cada94f0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -1215,6 +1238,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -1222,6 +1250,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1241,10 +1270,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD ======= @@ -1261,11 +1293,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -1309,6 +1345,14 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) @@ -1316,6 +1360,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1380,6 +1425,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) @@ -1387,6 +1437,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2081,6 +2132,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -2141,6 +2194,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -2648,6 +2702,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2666,6 +2722,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -2726,6 +2783,14 @@ ======= >>>>>>> 24218aa338 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -2738,6 +2803,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -3190,12 +3256,15 @@ ======= ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3954,6 +4023,11 @@ <<<<<<< HEAD >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +======= >>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -3963,6 +4037,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4002,6 +4077,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -4013,6 +4090,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -4038,6 +4116,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) ======= @@ -4050,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -4093,6 +4174,16 @@ >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +======= >>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -4104,15 +4195,19 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +<<<<<<< HEAD >>>>>>> locationtech-main >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -4169,6 +4264,13 @@ <<<<<<< HEAD >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +======= +======= >>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -4176,6 +4278,9 @@ >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -4185,6 +4290,7 @@ >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -4220,9 +4326,16 @@ ======= ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -4237,10 +4350,15 @@ ======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e1a25e8984 ([maven-release-plugin] prepare for next development iteration) @@ -7991,6 +8109,17 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml index f1df58aca000..f6f2e381b83d 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml @@ -70,6 +70,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 06775f0442 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -113,12 +114,17 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) @@ -145,6 +151,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml @@ -532,6 +539,8 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 1562748d0b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -543,6 +552,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -557,6 +567,8 @@ >>>>>>> d4930198fe ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 9e7e1887a7 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> ab4d758ed7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -564,6 +576,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -578,6 +591,8 @@ >>>>>>> 5385652451 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 0088e6eff1 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -585,6 +600,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -599,6 +615,8 @@ >>>>>>> f98093d8c2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -606,6 +624,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -620,6 +639,8 @@ >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -627,6 +648,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -641,6 +663,8 @@ >>>>>>> 24218aa338 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> c8e80535d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -648,6 +672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -662,6 +687,8 @@ >>>>>>> ea944a3a53 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> a0c34ab601 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 59c99fa93a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -669,6 +696,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -683,12 +711,15 @@ >>>>>>> 5f93befebf ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= <<<<<<< HEAD @@ -930,6 +961,8 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -937,6 +970,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -966,6 +1000,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -974,6 +1010,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -981,6 +1020,7 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -1004,6 +1044,8 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -1013,6 +1055,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1070,12 +1113,17 @@ >>>>>>> 24218aa338 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1115,6 +1163,8 @@ >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 92609167dd ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -1122,12 +1172,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 9e7e1887a7 ([maven-release-plugin] prepare for next development iteration) @@ -1164,12 +1218,18 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1182,12 +1242,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -1198,12 +1261,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -1234,11 +1300,20 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1276,6 +1351,8 @@ ======= >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -1283,6 +1360,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1308,6 +1386,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -1316,6 +1396,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) @@ -1571,6 +1652,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -1606,6 +1689,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1773,6 +1857,8 @@ ======= >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -1789,6 +1875,7 @@ 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fb47f5073b ([maven-release-plugin] prepare for next development iteration):geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo2/pom.xml ======= >>>>>>> 059393960c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat):geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo2/pom.xml @@ -1995,10 +2082,16 @@ <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +<<<<<<< HEAD +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml @@ -2026,6 +2119,13 @@ ======= <<<<<<< HEAD ======= +>>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) ======= @@ -2036,6 +2136,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml @@ -2064,28 +2165,41 @@ ======= >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main +======= >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml >>>>>>> 7cd2c4188b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat):geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo2/pom.xml ======= ======= >>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 1562748d0b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> locationtech-main >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -2095,6 +2209,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) @@ -2153,17 +2268,24 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main +======= >>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -2180,6 +2302,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD ======= @@ -2209,20 +2332,26 @@ ======= >>>>>>> 5f93befebf ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -2262,6 +2391,11 @@ >>>>>>> f98093d8c2 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 5f93befebf ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +======= >>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -2270,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD ======= @@ -2298,6 +2433,8 @@ ======= >>>>>>> 5f93befebf ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 9e7e1887a7 ([maven-release-plugin] prepare for next development iteration) @@ -2308,16 +2445,20 @@ >>>>>>> ab4d758ed7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) @@ -2354,11 +2495,17 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -2390,6 +2537,11 @@ >>>>>>> 417ad813eb ([maven-release-plugin] prepare for next development iteration) >>>>>>> f98093d8c2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 0088e6eff1 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -2398,6 +2550,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b2cada94f0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2412,6 +2565,8 @@ >>>>>>> b2cada94f0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 0b8cf9c4f6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -2420,6 +2575,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2434,6 +2590,8 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -2442,6 +2600,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5f17de37ee (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) @@ -2462,11 +2621,16 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -2480,26 +2644,34 @@ ======= >>>>>>> 24218aa338 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -2508,6 +2680,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a801bb2986 ([maven-release-plugin] prepare for next development iteration) >>>>>>> c8e80535d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2528,12 +2701,17 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> c8e80535d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2566,6 +2744,8 @@ >>>>>>> 5fae301729 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 14ffb5a7d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> a0c34ab601 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -2575,6 +2755,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2589,6 +2770,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5f93befebf ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 59c99fa93a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -2597,6 +2780,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= @@ -2611,6 +2795,8 @@ >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') >>>>>>> ec6d06b576 (Merge branch 'feature/postgis-fixes') >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -2618,6 +2804,7 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -6520,6 +6707,9 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 @@ -6577,6 +6767,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark-runtime-accumulo20/pom.xml >>>>>>> 87bf55340 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -6671,6 +6862,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main org.apache.accumulo accumulo-hadoop-mapreduce compile @@ -6685,6 +6878,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6786,6 +6980,9 @@ ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main com.google.guava guava compile @@ -6905,6 +7102,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -7060,6 +7258,11 @@ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main org.apache.parquet org.locationtech.geomesa.shaded.org.apache.parquet diff --git a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml index 32748aeb1bc2..b8961a111884 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-spark/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala b/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala index 4677bb4263f7..e6c6c6207f0f 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala +++ b/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala @@ -82,6 +82,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1394,6 +1395,20 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> 425a920afa (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala + val config = new JobConf(conf) +======= + val config = new Configuration(conf) +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala +======= + val config = new JobConf(conf) +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala +>>>>>>> locationtech-main +======= +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -1410,6 +1425,8 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -1419,6 +1436,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1430,6 +1448,8 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> 8a2a90410b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 5914db8cf8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main val config = new JobConf(conf) ======= @@ -1437,17 +1457,21 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5914db8cf8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a8ce2896de (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= @@ -1455,10 +1479,13 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala >>>>>>> 0da1bb22c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= ======= val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala <<<<<<< HEAD @@ -1473,6 +1500,10 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= >>>>>>> locationtech-main ======= +<<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala +>>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main ======= val config = new Configuration(conf) @@ -1484,6 +1515,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1527,12 +1559,17 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= +======= +<<<<<<< HEAD >>>>>>> locationtech-main val config = new JobConf(conf) ======= val config = new Configuration(conf) >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala >>>>>>> locationtech-main @@ -1564,6 +1601,9 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= >>>>>>> locationtech-main ======= +>>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala +>>>>>>> locationtech-main +======= ======= val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -1575,6 +1615,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1610,12 +1651,18 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= >>>>>>> 79f83f5952 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main ======= val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1635,11 +1682,14 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> 821e3db83f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala >>>>>>> ea0c690e2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1678,12 +1728,20 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +======= +======= +======= + val config = new JobConf(conf) +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala ======= ======= >>>>>>> locationtech-main +<<<<<<< HEAD >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD:geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/accumulo/spark/AccumuloSpatialRDDProvider.scala >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala @@ -1697,6 +1755,8 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= val config = new Configuration(conf) >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -1708,6 +1768,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c6103aab4 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -3451,6 +3512,8 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 74c6b7f8d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)):geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala >>>>>>> 30b076b423 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main GeoMesaAccumuloInputFormat.configure(config, paramsAsJava, qp, Some(ds.auths)) sc.newAPIHadoopRDD(config, classOf[GeoMesaAccumuloInputFormat], classOf[Text], classOf[SimpleFeature]).map(_._2) } diff --git a/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala b/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala index 175b33fb8b09..dbf260d3287e 100644 --- a/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala +++ b/geomesa-accumulo/geomesa-accumulo-spark/src/main/scala/org/locationtech/geomesa/spark/accumulo/AccumuloSpatialRDDProvider.scala @@ -106,6 +106,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= @@ -901,6 +902,9 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= >>>>>>> a773c6ef65 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -921,6 +925,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -1024,6 +1029,10 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> locationtech-main ======= ======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> ea0c690e2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD @@ -1034,6 +1043,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1122,6 +1132,11 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -1138,6 +1153,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2567,12 +2583,18 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= >>>>>>> 8a2d3cfac9 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= +>>>>>>> 76328bb49 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 02ddf6ca4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a358de35a8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> 08ee2fed57 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -2581,12 +2603,15 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 44b15e96d9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 813cf035d0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -3179,6 +3204,8 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> 8a2d3cfac9 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main val config = new JobConf(conf) ======= val config = new Configuration(conf) @@ -3236,6 +3263,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -4189,6 +4217,9 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> ffdb14e2a7 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> ea5f19f56b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> locationtech-main val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -4219,6 +4250,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5a7f44513 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -4363,6 +4395,9 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= >>>>>>> 5d88c18b90 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= @@ -4376,6 +4411,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -4423,11 +4459,14 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> 33d2777a8a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -4717,6 +4756,10 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { >>>>>>> e4ee051914 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 260d67442f (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 9e74e1d9b4 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= >>>>>>> locationtech-main val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -4734,6 +4777,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4851,12 +4895,15 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> ea0c690e2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 260d67442f (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -6506,6 +6553,8 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= >>>>>>> 0d96d8bd55 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +>>>>>>> locationtech-main ======= val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -6515,6 +6564,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7a3d004ad (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> bd6dd934cc (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -7048,6 +7098,8 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 74c6b7f8d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 76328bb49 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -7056,6 +7108,7 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 4c9fb0f6e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> b51d3046a2 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -7097,11 +7150,14 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= val config = new JobConf(conf) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 85d211ca2 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +<<<<<<< HEAD >>>>>>> 7119f2c52 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> adf2ac19a8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -7581,6 +7637,14 @@ class AccumuloSpatialRDDProvider extends SpatialRDDProvider with LazyLogging { val config = new JobConf(conf) >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 02ddf6ca4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= + val config = new JobConf(conf) +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main GeoMesaAccumuloInputFormat.configure(config, paramsAsJava, qp, Some(ds.auths)) sc.newAPIHadoopRDD(config, classOf[GeoMesaAccumuloInputFormat], classOf[Text], classOf[SimpleFeature]).map(_._2) } diff --git a/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh b/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh index bf4e6c9a7c91..99aae299dcf1 100755 --- a/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh +++ b/geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh @@ -74,6 +74,7 @@ function dependencies() { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 234aacdc1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -139,6 +140,8 @@ function dependencies() { >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main "org.apache.thrift:libthrift:%%thrift.version%%:jar" ======= <<<<<<< HEAD @@ -151,6 +154,7 @@ function dependencies() { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -277,6 +281,8 @@ function dependencies() { >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main ) fi diff --git a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml index 549790119dcf..c9a07b09f769 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/pom.xml +++ b/geomesa-accumulo/geomesa-accumulo-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/ingest/AccumuloBulkIngestCommand.scala b/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/ingest/AccumuloBulkIngestCommand.scala index a0487869a192..1f1a31e814f7 100644 --- a/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/ingest/AccumuloBulkIngestCommand.scala +++ b/geomesa-accumulo/geomesa-accumulo-tools/src/main/scala/org/locationtech/geomesa/accumulo/tools/ingest/AccumuloBulkIngestCommand.scala @@ -17,6 +17,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -24,6 +27,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -434,6 +438,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -441,6 +447,7 @@ <<<<<<< HEAD >>>>>>> 120815d0b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b54485f5a2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -455,12 +462,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -809,6 +819,8 @@ >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -821,13 +833,17 @@ package org.locationtech.geomesa.accumulo.tools.ingest <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= import java.io.File >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -946,6 +962,8 @@ import java.io.File >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import com.beust.jcommander.{Parameter, ParameterException, Parameters} import com.typesafe.config.Config import org.apache.hadoop.conf.Configuration @@ -958,6 +976,7 @@ import org.locationtech.geomesa.accumulo.jobs.mapreduce.GeoMesaAccumuloFileOutpu <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -1070,6 +1089,10 @@ import org.locationtech.geomesa.accumulo.jobs.mapreduce.GeoMesaAccumuloFileOutpu ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import org.locationtech.geomesa.accumulo.tools.AccumuloDataStoreCommand.AccumuloDistributedCommand import org.locationtech.geomesa.accumulo.tools.AccumuloDataStoreParams import org.locationtech.geomesa.accumulo.tools.ingest.AccumuloBulkIngestCommand.AccumuloBulkIngestParams @@ -1079,6 +1102,7 @@ import org.locationtech.geomesa.jobs.JobResult.JobSuccess <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.geomesa.jobs.accumulo.mapreduce.GeoMesaAccumuloFileOutputFormat >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -1198,6 +1222,11 @@ import org.locationtech.geomesa.jobs.accumulo.mapreduce.GeoMesaAccumuloFileOutpu import org.locationtech.geomesa.jobs.accumulo.mapreduce.GeoMesaAccumuloFileOutputFormat >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +import org.locationtech.geomesa.jobs.accumulo.mapreduce.GeoMesaAccumuloFileOutputFormat +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import org.locationtech.geomesa.jobs.mapreduce.ConverterCombineInputFormat import org.locationtech.geomesa.jobs.{Awaitable, JobResult, StatusCallback} import org.locationtech.geomesa.tools.DistributedRunParam.RunModes @@ -1220,6 +1249,7 @@ import java.io.File <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1456,6 +1486,10 @@ import java.io.File ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main class AccumuloBulkIngestCommand extends IngestCommand[AccumuloDataStore] with AccumuloDistributedCommand { override val name = "bulk-ingest" diff --git a/geomesa-accumulo/pom.xml b/geomesa-accumulo/pom.xml index 5c7777140b69..57aa0e538960 100644 --- a/geomesa-accumulo/pom.xml +++ b/geomesa-accumulo/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml b/geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml index ab7260f6d5a3..0eb1d84498b1 100644 --- a/geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-binary-dist/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main geomesa-archetypes-binary-dist_2.12 diff --git a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml index 181584f0d827..eedfaa074d82 100644 --- a/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml +++ b/geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main geomesa-archetypes-gs-plugin_2.12 diff --git a/geomesa-archetypes/pom.xml b/geomesa-archetypes/pom.xml index 1c167f29af8d..fa761363f413 100644 --- a/geomesa-archetypes/pom.xml +++ b/geomesa-archetypes/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main geomesa-archetypes_2.12 diff --git a/geomesa-arrow/geomesa-arrow-datastore/pom.xml b/geomesa-arrow/geomesa-arrow-datastore/pom.xml index 3f04417fbd44..2aea2e4f49e9 100644 --- a/geomesa-arrow/geomesa-arrow-datastore/pom.xml +++ b/geomesa-arrow/geomesa-arrow-datastore/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-dist/pom.xml b/geomesa-arrow/geomesa-arrow-dist/pom.xml index 278e0a3701f9..d2a1f6e4f0d9 100644 --- a/geomesa-arrow/geomesa-arrow-dist/pom.xml +++ b/geomesa-arrow/geomesa-arrow-dist/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml index 357bbe974d01..dc18f6a97dfa 100644 --- a/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gs-plugin/pom.xml @@ -48,6 +48,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -551,6 +552,8 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -561,6 +564,7 @@ ======= ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -812,6 +816,13 @@ ======= >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD +======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -825,6 +836,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -860,12 +872,15 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 9a1ca2afcc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> a0515b7519 ([maven-release-plugin] prepare for next development iteration) @@ -977,10 +992,13 @@ >>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9e7e1887a7 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -995,10 +1013,17 @@ ======= ======= ======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1008,6 +1033,8 @@ >>>>>>> 0088e6eff1 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -1017,6 +1044,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1029,10 +1057,13 @@ >>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1042,12 +1073,16 @@ >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1076,12 +1111,17 @@ >>>>>>> 8d80a87f7e ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1108,12 +1148,19 @@ >>>>>>> 5fae301729 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1127,6 +1174,8 @@ ======= >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -1134,6 +1183,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -1632,6 +1682,8 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -1702,6 +1754,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2144,6 +2197,8 @@ ======= >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2162,6 +2217,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -2254,6 +2310,14 @@ ======= >>>>>>> 24218aa338 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -2269,6 +2333,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2320,6 +2385,8 @@ ======= >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD @@ -2329,6 +2396,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2385,6 +2453,12 @@ ======= ======= >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +======= >>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -2398,6 +2472,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2943,10 +3018,41 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= @@ -3053,6 +3159,29 @@ >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -3063,6 +3192,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -9511,6 +9641,23 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-arrow/geomesa-arrow-gt/pom.xml b/geomesa-arrow/geomesa-arrow-gt/pom.xml index 1a6ae67477f0..202a701c99bd 100644 --- a/geomesa-arrow/geomesa-arrow-gt/pom.xml +++ b/geomesa-arrow/geomesa-arrow-gt/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/vector/ArrowAttributeWriter.scala b/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/vector/ArrowAttributeWriter.scala index 3e2b01698c41..4d4e1e70eb46 100644 --- a/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/vector/ArrowAttributeWriter.scala +++ b/geomesa-arrow/geomesa-arrow-gt/src/main/scala/org/locationtech/geomesa/arrow/vector/ArrowAttributeWriter.scala @@ -21,6 +21,7 @@ package vector <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 822d0242c (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) ======= @@ -239,11 +240,14 @@ import java.util.{Date, UUID} ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= import java.nio.charset.StandardCharsets import java.util.{Date, UUID} >>>>>>> 728c6f1ae (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9e2da6708a (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) ======= ======= @@ -468,6 +472,10 @@ import java.util.{Date, UUID} ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main import org.apache.arrow.memory.BufferAllocator import org.apache.arrow.vector._ import org.apache.arrow.vector.complex.{FixedSizeListVector, ListVector, StructVector} @@ -969,6 +977,7 @@ object ArrowAttributeWriter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main class ArrowUuidWriter(val name: String, metadata: Map[String, String], factory: VectorFactory) @@ -1345,6 +1354,11 @@ object ArrowAttributeWriter { class ArrowUuidWriter(val name: String, metadata: Map[String, String], factory: VectorFactory) ======= ======= +======= + class ArrowUuidWriter(val name: String, metadata: Map[String, String], factory: VectorFactory) +======= +======= +>>>>>>> locationtech-main >>>>>>> 35d3871b3 (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) ======= >>>>>>> b51dd8f02 (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) @@ -1371,6 +1385,7 @@ object ArrowAttributeWriter { class ArrowUuidWriter(name: String, metadata: Map[String, String], factory: VectorFactory) >>>>>>> 728c6f1ae (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9e2da6708a (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) ======= ======= @@ -1950,6 +1965,10 @@ object ArrowAttributeWriter { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main extends ArrowAttributeWriter { val fieldType: FieldType = new FieldType(true, new ArrowType.FixedSizeList(2), null, metadata.asJava) override val vector: FixedSizeListVector = factory.apply(name, fieldType) @@ -1987,6 +2006,7 @@ object ArrowAttributeWriter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 822d0242c (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) ======= @@ -2482,6 +2502,15 @@ object ArrowAttributeWriter { class ArrowFeatureIdMinimalUuidWriter(val name: String, factory: VectorFactory) >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= + class ArrowFeatureIdMinimalUuidWriter(val name: String, factory: VectorFactory) +======= + class ArrowFeatureIdMinimalUuidWriter(name: String, factory: VectorFactory) +>>>>>>> 728c6f1ae (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) +======= + class ArrowFeatureIdMinimalUuidWriter(val name: String, factory: VectorFactory) +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main extends ArrowAttributeWriter { override val vector: IntVector = factory.apply(name, MinorType.INT, Map.empty) diff --git a/geomesa-arrow/geomesa-arrow-gt/src/test/scala/org/locationtech/geomesa/arrow/vector/SimpleFeatureVectorTest.scala b/geomesa-arrow/geomesa-arrow-gt/src/test/scala/org/locationtech/geomesa/arrow/vector/SimpleFeatureVectorTest.scala index b3e3aef09193..1110e874bc3d 100644 --- a/geomesa-arrow/geomesa-arrow-gt/src/test/scala/org/locationtech/geomesa/arrow/vector/SimpleFeatureVectorTest.scala +++ b/geomesa-arrow/geomesa-arrow-gt/src/test/scala/org/locationtech/geomesa/arrow/vector/SimpleFeatureVectorTest.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.arrow.vector <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import java.util.{Date, UUID} >>>>>>> 728c6f1ae (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) @@ -131,6 +132,11 @@ import java.util.{Date, UUID} import java.util.{Date, UUID} >>>>>>> 728c6f1ae (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) >>>>>>> 782023083a (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) +======= +======= +import java.util.{Date, UUID} +>>>>>>> 728c6f1ae (GEOMESA-3137 Arrow - UUID attribute types cause queries to fail (#2809)) +>>>>>>> locationtech-main import org.apache.arrow.vector.complex.FixedSizeListVector import org.apache.arrow.vector.{BigIntVector, IntVector} import org.geotools.util.Converters diff --git a/geomesa-arrow/geomesa-arrow-jts/pom.xml b/geomesa-arrow/geomesa-arrow-jts/pom.xml index 49be5dad4fe5..b30272f89209 100644 --- a/geomesa-arrow/geomesa-arrow-jts/pom.xml +++ b/geomesa-arrow/geomesa-arrow-jts/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-arrow/geomesa-arrow-tools/pom.xml b/geomesa-arrow/geomesa-arrow-tools/pom.xml index 0f390181de4a..8a95d7311ee4 100644 --- a/geomesa-arrow/geomesa-arrow-tools/pom.xml +++ b/geomesa-arrow/geomesa-arrow-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-arrow/pom.xml b/geomesa-arrow/pom.xml index 756be29ca554..ccba85ed2e5e 100644 --- a/geomesa-arrow/pom.xml +++ b/geomesa-arrow/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml index 7242e277a829..f50a207bf683 100644 --- a/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-datastore/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml index 7d279c82134f..7554bfbd9373 100644 --- a/geomesa-bigtable/geomesa-bigtable-dist/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-dist/pom.xml @@ -110,6 +110,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1280,11 +1281,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2391,6 +2395,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2399,6 +2405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2891,12 +2898,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3272,6 +3286,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3279,12 +3301,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3325,6 +3351,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3338,6 +3369,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3456,11 +3488,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3471,11 +3507,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3619,6 +3658,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3630,6 +3673,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3908,6 +3952,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3919,6 +3969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4066,6 +4117,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4078,6 +4131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6697,6 +6751,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6793,6 +6849,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8268,6 +8325,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8286,6 +8345,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9781,12 +9841,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12485,6 +12548,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12492,6 +12557,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12534,9 +12600,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14092,6 +14161,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14099,6 +14172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14165,10 +14239,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14186,10 +14285,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14223,19 +14330,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15304,11 +15430,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15326,6 +15457,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml index a0424cc49891..775287150624 100644 --- a/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-gs-plugin/pom.xml @@ -111,6 +111,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1281,11 +1282,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2392,6 +2396,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2400,6 +2406,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2892,12 +2899,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3273,6 +3287,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3280,12 +3302,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3326,6 +3352,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3339,6 +3370,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3457,11 +3489,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3472,11 +3508,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3620,6 +3659,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3631,6 +3674,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3909,6 +3953,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3920,6 +3970,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4067,6 +4118,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4079,6 +4132,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6698,6 +6752,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6794,6 +6850,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8269,6 +8326,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8287,6 +8346,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9782,12 +9842,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12486,6 +12549,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12493,6 +12558,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12535,9 +12601,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14093,6 +14162,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14100,6 +14173,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14166,10 +14240,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14187,10 +14286,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14224,19 +14331,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15305,11 +15431,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15327,6 +15458,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -15361,6 +15502,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15559,6 +15701,8 @@ >>>>>>> locationtech-main ======= >>>>>>> ea5bb37862 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> locationtech-main org.locationtech.geomesa geomesa-feature-avro_${scala.binary.version} @@ -15582,6 +15726,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15843,6 +15988,8 @@ >>>>>>> 06775f0442 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> ea5bb37862 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> locationtech-main diff --git a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml index fd989075633f..af9aee440c0d 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark-runtime/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1321,11 +1322,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2447,6 +2451,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2455,6 +2461,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2947,12 +2954,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3328,6 +3342,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3335,12 +3357,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3381,6 +3407,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3394,6 +3425,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3512,11 +3544,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3527,11 +3563,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3675,6 +3714,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3686,6 +3729,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3964,6 +4008,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3975,6 +4025,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4122,6 +4173,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4134,6 +4187,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6753,6 +6807,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6849,6 +6905,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8324,6 +8381,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8342,6 +8401,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9837,12 +9897,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12568,6 +12631,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12575,6 +12640,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12617,9 +12683,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14228,6 +14297,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14235,6 +14308,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14305,10 +14379,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14326,10 +14425,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14363,19 +14470,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15482,11 +15608,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15504,6 +15635,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml index 0e631fcc44c3..cf01e36e525a 100644 --- a/geomesa-bigtable/geomesa-bigtable-spark/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-spark/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml index c49af1942c66..6cfde79076ac 100644 --- a/geomesa-bigtable/geomesa-bigtable-tools/pom.xml +++ b/geomesa-bigtable/geomesa-bigtable-tools/pom.xml @@ -110,6 +110,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1280,11 +1281,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2391,6 +2395,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2399,6 +2405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2891,12 +2898,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3272,6 +3286,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3279,12 +3301,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3325,6 +3351,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3338,6 +3369,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3456,11 +3488,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3471,11 +3507,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3619,6 +3658,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3630,6 +3673,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3908,6 +3952,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3919,6 +3969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4066,6 +4117,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4078,6 +4131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6697,6 +6751,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6793,6 +6849,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8268,6 +8325,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8286,6 +8345,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9781,12 +9841,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12485,6 +12548,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12492,6 +12557,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12534,9 +12600,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14092,6 +14161,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14099,6 +14172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14165,10 +14239,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14186,10 +14285,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14223,19 +14330,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15304,11 +15430,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15326,6 +15457,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-bigtable/pom.xml b/geomesa-bigtable/pom.xml index a8695f0fd8cc..878f0986eb9b 100644 --- a/geomesa-bigtable/pom.xml +++ b/geomesa-bigtable/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml index d47d64404d8f..5f135d9e4600 100644 --- a/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-datastore/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml index e8033e6efa10..ba3df34dfc4a 100644 --- a/geomesa-cassandra/geomesa-cassandra-dist/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-dist/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml index b3aa2c4ab50d..e6d96a8730a4 100644 --- a/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-gs-plugin/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml index 4646194e66f5..c6221a5dc70e 100644 --- a/geomesa-cassandra/geomesa-cassandra-tools/pom.xml +++ b/geomesa-cassandra/geomesa-cassandra-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-cassandra/pom.xml b/geomesa-cassandra/pom.xml index 1bb8190431e9..01a87e797f87 100644 --- a/geomesa-cassandra/pom.xml +++ b/geomesa-cassandra/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-all/pom.xml b/geomesa-convert/geomesa-convert-all/pom.xml index 8560ea1498c7..994fbab23fcc 100644 --- a/geomesa-convert/geomesa-convert-all/pom.xml +++ b/geomesa-convert/geomesa-convert-all/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-all/src/test/scala/org/locationtech/geomesa/convert/ApiTest.scala b/geomesa-convert/geomesa-convert-all/src/test/scala/org/locationtech/geomesa/convert/ApiTest.scala index 653f8299874a..9e66f29cc9d9 100644 --- a/geomesa-convert/geomesa-convert-all/src/test/scala/org/locationtech/geomesa/convert/ApiTest.scala +++ b/geomesa-convert/geomesa-convert-all/src/test/scala/org/locationtech/geomesa/convert/ApiTest.scala @@ -17,6 +17,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -24,6 +27,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -434,6 +438,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -441,6 +447,7 @@ <<<<<<< HEAD >>>>>>> 74661c314 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6839f8efad (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -455,12 +462,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -809,6 +819,8 @@ >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -834,6 +846,7 @@ import java.io.InputStream <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -890,6 +903,9 @@ import java.io.InputStream ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main import java.io.{ByteArrayInputStream, InputStream} import java.nio.charset.StandardCharsets @@ -897,6 +913,7 @@ import com.typesafe.config.ConfigFactory <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -986,6 +1003,8 @@ import pureconfig.error.ConfigReaderFailures >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main import org.apache.commons.io.IOUtils import org.junit.runner.RunWith import org.locationtech.geomesa.convert.TestConverterFactory.TestField @@ -1007,6 +1026,7 @@ import pureconfig.error.ConfigReaderFailures <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1033,6 +1053,8 @@ import pureconfig.error.ConfigReaderFailures >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main @RunWith(classOf[JUnitRunner]) class ApiTest extends Specification { @@ -1072,6 +1094,7 @@ class ApiTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -1164,6 +1187,9 @@ import java.io.InputStream ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main class TestConverter(sft: SimpleFeatureType, config: BasicConfig, fields: Seq[TestField], options: BasicOptions) extends AbstractConverter[String, BasicConfig, TestField, BasicOptions](sft, config, fields, options) { @@ -1184,6 +1210,7 @@ class TestConverterFactory extends AbstractConverterFactory[TestConverter, Basic <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1245,6 +1272,9 @@ class TestConverterFactory extends AbstractConverterFactory[TestConverter, Basic ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main class TestConverterFactory extends AbstractConverterFactory[TestConverter, BasicConfig, TestField, BasicOptions] { override protected val typeToProcess: String = "test" override protected implicit val configConvert: ConverterConfigConvert[BasicConfig] = BasicConfigConvert @@ -1254,6 +1284,7 @@ class TestConverterFactory extends AbstractConverterFactory[TestConverter, Basic <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -1345,6 +1376,9 @@ class TestConverterFactory extends AbstractConverterFactory[TestConverter, Basic ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main object TestConverterFactory { @@ -1383,6 +1417,7 @@ object TestConverterFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1439,6 +1474,9 @@ object TestConverterFactory { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main case class TestDerivedField(name: String, transforms: Option[Expression]) extends TestField case class TestSplitField(name: String, transforms: Option[Expression]) extends TestField { @@ -1447,6 +1485,7 @@ object TestConverterFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -1542,6 +1581,9 @@ object TestConverterFactory { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } @@ -1555,6 +1597,7 @@ class TestFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = "foo " + args(0) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -1674,6 +1717,11 @@ class TestFunctionFactory extends TransformerFunctionFactory { override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = "foo " + args(0) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = "foo " + args(0) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } private val bar = new TransformerFunction { @@ -1684,6 +1732,7 @@ class TestFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = "bar " + args(0) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -1803,5 +1852,10 @@ class TestFunctionFactory extends TransformerFunctionFactory { override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = "bar " + args(0) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = "bar " + args(0) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } diff --git a/geomesa-convert/geomesa-convert-all/src/test/scala/org/locationtech/geomesa/convert/testing/ScriptingFunctionFactoryTest.scala b/geomesa-convert/geomesa-convert-all/src/test/scala/org/locationtech/geomesa/convert/testing/ScriptingFunctionFactoryTest.scala index 415039a9d23d..accb46c96406 100644 --- a/geomesa-convert/geomesa-convert-all/src/test/scala/org/locationtech/geomesa/convert/testing/ScriptingFunctionFactoryTest.scala +++ b/geomesa-convert/geomesa-convert-all/src/test/scala/org/locationtech/geomesa/convert/testing/ScriptingFunctionFactoryTest.scala @@ -62,6 +62,7 @@ class ScriptingFunctionFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -116,6 +117,8 @@ class ScriptingFunctionFactoryTest extends Specification { >>>>>>> location-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= hello.eval(Array("geomesa")) mustEqual "hello: geomesa" val gbye = sff.functions.find(_.names.contains("js:gbye")).head @@ -127,6 +130,7 @@ class ScriptingFunctionFactoryTest extends Specification { >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -221,6 +225,8 @@ class ScriptingFunctionFactoryTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } finally { ScriptingFunctionFactory.ConvertScriptsPath.threadLocalValue.remove() } diff --git a/geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml b/geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml index 776ba533e18d..b447a72790be 100644 --- a/geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml +++ b/geomesa-convert/geomesa-convert-avro-schema-registry/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-avro/pom.xml b/geomesa-convert/geomesa-convert-avro/pom.xml index 9b4cbfdb926a..9b62bd59142a 100644 --- a/geomesa-convert/geomesa-convert-avro/pom.xml +++ b/geomesa-convert/geomesa-convert-avro/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-avro/src/main/scala/org/locationtech/geomesa/convert/avro/AvroConverter.scala b/geomesa-convert/geomesa-convert-avro/src/main/scala/org/locationtech/geomesa/convert/avro/AvroConverter.scala index 30213dc4b114..260d561cbae6 100644 --- a/geomesa-convert/geomesa-convert-avro/src/main/scala/org/locationtech/geomesa/convert/avro/AvroConverter.scala +++ b/geomesa-convert/geomesa-convert-avro/src/main/scala/org/locationtech/geomesa/convert/avro/AvroConverter.scala @@ -97,6 +97,7 @@ object AvroConverter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Schema.createUnion(schema.getTypes.asScala.map(addBytes): _*) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -216,6 +217,11 @@ object AvroConverter { Schema.createUnion(schema.getTypes.asScala.map(addBytes): _*) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + Schema.createUnion(schema.getTypes.asScala.map(addBytes): _*) +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main case _ => throw new NotImplementedError( diff --git a/geomesa-convert/geomesa-convert-avro/src/main/scala/org/locationtech/geomesa/convert/avro/AvroFunctionFactory.scala b/geomesa-convert/geomesa-convert-avro/src/main/scala/org/locationtech/geomesa/convert/avro/AvroFunctionFactory.scala index 486523e7db43..3e3c358dea5d 100644 --- a/geomesa-convert/geomesa-convert-avro/src/main/scala/org/locationtech/geomesa/convert/avro/AvroFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-avro/src/main/scala/org/locationtech/geomesa/convert/avro/AvroFunctionFactory.scala @@ -31,6 +31,7 @@ class AvroFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeList(ByteBuffer.wrap(bytes)) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -150,6 +151,11 @@ class AvroFunctionFactory extends TransformerFunctionFactory { case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeList(ByteBuffer.wrap(bytes)) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeList(ByteBuffer.wrap(bytes)) +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main case null => null case arg => throw new IllegalArgumentException(s"Expected byte array but got: $arg") } @@ -163,6 +169,7 @@ class AvroFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeMap(ByteBuffer.wrap(bytes)) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -282,6 +289,11 @@ class AvroFunctionFactory extends TransformerFunctionFactory { case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeMap(ByteBuffer.wrap(bytes)) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeMap(ByteBuffer.wrap(bytes)) +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main case null => null case arg => throw new IllegalArgumentException(s"Expected byte array but got: $arg") } @@ -295,6 +307,7 @@ class AvroFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeUUID(ByteBuffer.wrap(bytes)) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -414,6 +427,11 @@ class AvroFunctionFactory extends TransformerFunctionFactory { case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeUUID(ByteBuffer.wrap(bytes)) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + case bytes: Array[Byte] => AvroSimpleFeatureUtils.decodeUUID(ByteBuffer.wrap(bytes)) +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main case null => null case arg => throw new IllegalArgumentException(s"Expected byte array but got: $arg") } diff --git a/geomesa-convert/geomesa-convert-avro/src/test/scala/org/locationtech/geomesa/convert/avro/AvroConverterTest.scala b/geomesa-convert/geomesa-convert-avro/src/test/scala/org/locationtech/geomesa/convert/avro/AvroConverterTest.scala index adb717c322a7..b07ab3ec2869 100644 --- a/geomesa-convert/geomesa-convert-avro/src/test/scala/org/locationtech/geomesa/convert/avro/AvroConverterTest.scala +++ b/geomesa-convert/geomesa-convert-avro/src/test/scala/org/locationtech/geomesa/convert/avro/AvroConverterTest.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.convert.avro <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -165,11 +166,16 @@ import com.google.common.hash.Hashing >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import java.io.{ByteArrayInputStream, ByteArrayOutputStream, File} import com.google.common.hash.Hashing >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main import com.typesafe.config.{ConfigFactory, ConfigRenderOptions} import com.typesafe.scalalogging.LazyLogging import org.apache.avro.file.DataFileWriter diff --git a/geomesa-convert/geomesa-convert-avro/src/test/scala/org/locationtech/geomesa/convert/avro/AvroTransformersTest.scala b/geomesa-convert/geomesa-convert-avro/src/test/scala/org/locationtech/geomesa/convert/avro/AvroTransformersTest.scala index b13e1d35b476..7ae96770d14d 100644 --- a/geomesa-convert/geomesa-convert-avro/src/test/scala/org/locationtech/geomesa/convert/avro/AvroTransformersTest.scala +++ b/geomesa-convert/geomesa-convert-avro/src/test/scala/org/locationtech/geomesa/convert/avro/AvroTransformersTest.scala @@ -129,6 +129,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -363,6 +364,10 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) @@ -385,6 +390,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -420,6 +426,8 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> locationtech-main <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -431,6 +439,7 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -460,12 +469,15 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> locationtech-main ======= >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -486,12 +498,15 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> locationtech-main ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -506,6 +521,8 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) @@ -516,6 +533,7 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -3436,6 +3454,13 @@ class AvroTransformersTest extends Specification with AvroUtils { exp.apply(Array(decoded)) mustEqual " foo " ======= <<<<<<< HEAD +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) + exp.apply(Array(decoded)) mustEqual " foo " +>>>>>>> locationtech-main +======= +<<<<<<< HEAD ======= exp.apply(Array(decoded)) mustEqual " foo " >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -3615,6 +3640,7 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') exp.eval(Array(decoded)) mustEqual " foo " >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> f0b9bd8121 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> location-main @@ -6798,6 +6824,8 @@ class AvroTransformersTest extends Specification with AvroUtils { exp.eval(Array(decoded)) mustEqual " foo " >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main } "handle compound expressions" >> { @@ -6906,6 +6934,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 77e09b8aaa (GEOMESA-3071 Move all converter state into evaluation context) @@ -6939,6 +6968,8 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6953,9 +6984,12 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> daa600442f (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6964,25 +6998,34 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -6992,9 +7035,12 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -7003,7 +7049,10 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main exp.apply(Array(decoded)) mustEqual "foo" } @@ -7011,6 +7060,7 @@ class AvroTransformersTest extends Specification with AvroUtils { Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull Expression("avroBinaryUuid(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull +<<<<<<< HEAD >>>>>>> 5f807ff388 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10090,6 +10140,11 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD >>>>>>> 1ba2f23b3d (GEOMESA-3071 Move all converter state into evaluation context) ======= +======= +======= +======= + exp.apply(Array(decoded)) mustEqual "foo" +>>>>>>> locationtech-main >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -10098,6 +10153,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6ac55e1ef7 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -10115,17 +10171,25 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 4f0e2712ab (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> locationtech-main exp.apply(Array(decoded)) mustEqual "foo" ======= <<<<<<< HEAD >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a9f01eaaf5 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -10160,6 +10224,11 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD >>>>>>> d1cf3ad8b5 (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main +======= <<<<<<< HEAD ======= <<<<<<< HEAD @@ -10168,6 +10237,7 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6eb31fb652 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> f3a49e0825 (GEOMESA-3071 Move all converter state into evaluation context) @@ -10245,14 +10315,27 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= ======= ======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= <<<<<<< HEAD >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0166e9455b (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10260,6 +10343,7 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -10274,13 +10358,22 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 77e09b8aaa (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main exp.apply(Array(decoded)) mustEqual "foo" ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10314,6 +10407,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dd5d6434b0 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> locationtech-main @@ -10406,6 +10500,9 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 07a6a5c291 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10418,6 +10515,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6eb31fb652 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c856 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10547,11 +10645,16 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10564,6 +10667,7 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) ======= +<<<<<<< HEAD >>>>>>> 08ec6e9fa0 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 1aa0b19c24 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10577,6 +10681,10 @@ class AvroTransformersTest extends Specification with AvroUtils { exp.apply(Array(decoded)) mustEqual "foo" ======= <<<<<<< HEAD +======= + exp.apply(Array(decoded)) mustEqual "foo" +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -10584,15 +10692,20 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9d708b240a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb7d3570f5 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -10600,20 +10713,27 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 4f0e2712ab (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9990cd7dc7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6ac55e1ef7 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -10621,12 +10741,17 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD >>>>>>> 5f428db977 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main ======= exp.apply(Array(decoded)) mustEqual "foo" ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76618c8da3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -10653,6 +10778,17 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= ======= ======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> locationtech-main ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10660,6 +10796,7 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -10819,10 +10956,18 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= ======= ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2c62962643 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 58081c6fc9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10973,9 +11118,33 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= ======= ======= +======= +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + exp.apply(Array(decoded)) mustEqual "foo" +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -15909,6 +16078,11 @@ class AvroTransformersTest extends Specification with AvroUtils { exp.apply(Array(decoded)) mustEqual "foo" >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= + exp.apply(Array(decoded)) mustEqual "foo" +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main exp.eval(Array(decoded)) mustEqual "foo" } @@ -15986,6 +16160,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -16002,11 +16177,14 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -16072,11 +16250,19 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +<<<<<<< HEAD +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= <<<<<<< HEAD >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= +<<<<<<< HEAD ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -16096,6 +16282,7 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) @@ -16166,6 +16353,8 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main @@ -16179,11 +16368,14 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) @@ -16197,6 +16389,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16217,6 +16410,11 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main +======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -16229,6 +16427,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bb1e627b99 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16238,6 +16437,8 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16274,6 +16475,7 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> 8ba157e9a8 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -16281,12 +16483,17 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16300,6 +16507,9 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16310,10 +16520,13 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -16323,6 +16536,9 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16331,11 +16547,14 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 60b2734c49 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> c37a34dcb9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16343,12 +16562,16 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 08ec6e9fa0 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16554,6 +16777,8 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 7bbce86d17 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull @@ -16576,6 +16801,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= @@ -16629,6 +16855,9 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -16651,6 +16880,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16684,6 +16914,8 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16710,6 +16942,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -16768,6 +17001,8 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) @@ -16822,6 +17057,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -16889,7 +17125,10 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main ======= +======= +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -16912,6 +17151,11 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= <<<<<<< HEAD >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -16944,10 +17188,13 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 55873b0ace (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -16956,6 +17203,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -16983,12 +17231,20 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main ======= Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull @@ -17010,6 +17266,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9627a2de6a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -17036,6 +17293,11 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> locationtech-main @@ -17051,6 +17313,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9627a2de6a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -17067,6 +17330,10 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -17096,6 +17363,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -17105,6 +17373,8 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= >>>>>>> 41b057b6f8 (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -17116,10 +17386,13 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 55873b0ace (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull @@ -17141,6 +17414,9 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) @@ -17162,6 +17438,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -17179,6 +17456,11 @@ class AvroTransformersTest extends Specification with AvroUtils { Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> a5946358db (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull @@ -17190,6 +17472,7 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a788dfac03 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -17198,6 +17481,8 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> a5946358db (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -17216,6 +17501,9 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull @@ -17241,6 +17529,7 @@ class AvroTransformersTest extends Specification with AvroUtils { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 08ec6e9fa0 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -17269,6 +17558,11 @@ class AvroTransformersTest extends Specification with AvroUtils { Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + Expression("avroBinaryList(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull + Expression("avroBinaryMap(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main >>>>>>> b1c506839 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -17277,6 +17571,9 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -17288,6 +17585,9 @@ class AvroTransformersTest extends Specification with AvroUtils { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= ======= ======= @@ -17315,6 +17615,7 @@ class AvroTransformersTest extends Specification with AvroUtils { >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= Expression("avroBinaryUuid(avroPath($0, '/content$type=TObj/foo'))").apply(Array(decoded)) must beNull @@ -24999,6 +25300,10 @@ class AvroTransformersTest extends Specification with AvroUtils { Expression("avroBinaryUuid(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + Expression("avroBinaryUuid(avroPath($0, '/content$type=TObj/foo'))").eval(Array(decoded)) must beNull +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main } } } diff --git a/geomesa-convert/geomesa-convert-common/pom.xml b/geomesa-convert/geomesa-convert-common/pom.xml index 1c3a50b3a680..68866dae14a4 100644 --- a/geomesa-convert/geomesa-convert-common/pom.xml +++ b/geomesa-convert/geomesa-convert-common/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/EvaluationContext.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/EvaluationContext.scala index 544fb697ed1c..1dfa84e888bb 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/EvaluationContext.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert/EvaluationContext.scala @@ -15,6 +15,7 @@ import org.locationtech.geomesa.convert.EvaluationContext.{EvaluationError, Fiel <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.geomesa.convert2.AbstractConverter.AbstractApiError >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -134,6 +135,11 @@ import org.locationtech.geomesa.convert2.AbstractConverter.AbstractApiError import org.locationtech.geomesa.convert2.AbstractConverter.AbstractApiError >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +import org.locationtech.geomesa.convert2.AbstractConverter.AbstractApiError +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main import org.locationtech.geomesa.convert2.Field import org.locationtech.geomesa.convert2.metrics.ConverterMetrics @@ -200,6 +206,7 @@ trait EvaluationContext { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -261,6 +268,9 @@ trait EvaluationContext { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main /** * Evaluate all values using the given arguments. The returned array may be mutated on subsequent calls to @@ -305,6 +315,7 @@ trait EvaluationContext { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -396,6 +407,9 @@ trait EvaluationContext { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } object EvaluationContext extends LazyLogging { @@ -418,6 +432,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -477,6 +492,8 @@ object EvaluationContext extends LazyLogging { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main /** * Creates a new evaluation context with the given state * @@ -493,6 +510,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -564,6 +582,9 @@ object EvaluationContext extends LazyLogging { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main def apply( fields: Seq[Field], globalValues: Map[String, _ <: AnyRef], @@ -577,6 +598,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -645,6 +667,8 @@ object EvaluationContext extends LazyLogging { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main /** * Creates a new evaluation context with the given state * @@ -731,6 +755,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -792,6 +817,9 @@ object EvaluationContext extends LazyLogging { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main // noinspection ScalaDeprecation @deprecated("Evaluation contexts should not be mutated") def setInputFilePath(path: String): Unit = ec.indexOf(InputFilePathKey) match { @@ -801,6 +829,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -892,6 +921,9 @@ object EvaluationContext extends LazyLogging { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } /** @@ -913,6 +945,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -933,6 +966,8 @@ object EvaluationContext extends LazyLogging { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= val cache: Map[String, EnrichmentCache], val metrics: ConverterMetrics, @@ -941,6 +976,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -980,6 +1016,8 @@ object EvaluationContext extends LazyLogging { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ) extends EvaluationContext { // holder for results from evaluating each row @@ -1077,6 +1115,7 @@ object EvaluationContext extends LazyLogging { globalValues: Map[String, Any], val cache: Map[String, EnrichmentCache], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD val metrics: ConverterMetrics >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -1128,6 +1167,10 @@ object EvaluationContext extends LazyLogging { val metrics: ConverterMetrics >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= + val metrics: ConverterMetrics +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main ) extends EvaluationContext { // holder for results from evaluating each row @@ -1172,6 +1215,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1423,6 +1467,8 @@ object EvaluationContext extends LazyLogging { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= override def accessor(name: String): FieldAccessor = @@ -1456,6 +1502,7 @@ object EvaluationContext extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -1547,5 +1594,8 @@ object EvaluationContext extends LazyLogging { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/AbstractCompositeConverter.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/AbstractCompositeConverter.scala index 34db144ff3de..67dd13552855 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/AbstractCompositeConverter.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/AbstractCompositeConverter.scala @@ -96,6 +96,7 @@ object AbstractCompositeConverter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -152,6 +153,9 @@ object AbstractCompositeConverter { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main // noinspection ScalaDeprecation case class CompositeEvaluationContext(contexts: Seq[EvaluationContext], success: Counter, failure: Counter) extends EvaluationContext { @@ -162,6 +166,7 @@ object AbstractCompositeConverter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -255,6 +260,9 @@ object AbstractCompositeConverter { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main override def cache: Map[String, EnrichmentCache] = throw new NotImplementedError() override def metrics: ConverterMetrics = throw new NotImplementedError() override def accessor(name: String): FieldAccessor = throw new NotImplementedError() diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/AbstractConverter.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/AbstractConverter.scala index ed798d7e3141..bb4d3566abfe 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/AbstractConverter.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/AbstractConverter.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.convert2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -73,6 +74,9 @@ package org.locationtech.geomesa.convert2 ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main import java.io.{IOException, InputStream} import java.nio.charset.{Charset, StandardCharsets} import java.util.Date @@ -80,6 +84,7 @@ import java.util.Date <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -171,6 +176,9 @@ import java.util.Date ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main import com.codahale.metrics.{Counter, Histogram} import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging @@ -294,6 +302,7 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.geomesa.utils.conversions.ScalaImplicits.RichArray ======= @@ -382,6 +391,10 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve ======= import org.locationtech.geomesa.utils.conversions.ScalaImplicits.RichArray >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + import org.locationtech.geomesa.utils.conversions.ScalaImplicits.RichArray +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.geotools.RichSimpleFeatureType.RichSimpleFeatureType import scala.collection.JavaConverters._ @@ -394,6 +407,7 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -555,6 +569,8 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main private val requiredFields: Array[Field] = AbstractConverter.requiredFields(this) private val attributeIndices: Array[(Int, Int)] = @@ -566,6 +582,7 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -592,6 +609,8 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main private val idIndex: Int = requiredFields.indexWhere(_.name == IdFieldName) @@ -599,6 +618,7 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -673,6 +693,8 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main private val userDataIndices: Array[(String, Int)] = requiredFields.flatMapWithIndex { case (f, i) => if (f.name.startsWith(UserDataFieldPrefix)) { @@ -680,6 +702,7 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve } else { Seq.empty <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD } } @@ -759,6 +782,11 @@ abstract class AbstractConverter[T, C <: ConverterConfig, F <: Field, O <: Conve } >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= + } + } +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main private val metrics = ConverterMetrics(sft, options.reporters) @@ -986,6 +1014,7 @@ object AbstractConverter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1006,6 +1035,8 @@ object AbstractConverter { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= object FieldApiError extends AbstractApiError("Field") @@ -1013,6 +1044,8 @@ object AbstractConverter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= /** @@ -1053,6 +1086,46 @@ object AbstractConverter { ordered } >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main + + /** + * Determines the fields that are actually used for the conversion + * + * @param converter converter + * @tparam T intermediate parsed values binding + * @tparam C config binding + * @tparam F field binding + * @tparam O options binding + * @return + */ + private def requiredFields[T, C <: ConverterConfig, F <: Field, O <: ConverterOptions]( + converter: AbstractConverter[T, C, F, O]): Array[Field] = { + + val fieldNameMap = converter.fields.map(f => f.name -> f).toMap + val dag = scala.collection.mutable.Map.empty[Field, Set[Field]] + + // compute only the input fields that we need to deal with to populate the simple feature + converter.sft.getAttributeDescriptors.asScala.foreach { ad => + fieldNameMap.get(ad.getLocalName).foreach(addDependencies(_, fieldNameMap, dag)) + } + + // add id field and user data + converter.config.idField.foreach { expression => + addDependencies(BasicField(IdFieldName, Some(expression)), fieldNameMap, dag) + } + converter.config.userData.foreach { case (key, expression) => + addDependencies(BasicField(UserDataFieldPrefix + key, Some(expression)), fieldNameMap, dag) + } + + // use a topological ordering to ensure that dependencies are evaluated before the fields that require them + val ordered = topologicalOrder(dag) + + // log warnings for missing/unused fields + checkMissingFields(converter, ordered.map(_.name)) + + ordered + } +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) /** diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/SimpleFeatureConverter.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/SimpleFeatureConverter.scala index 5355d0bfa38d..e7f4856fe95b 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/SimpleFeatureConverter.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/SimpleFeatureConverter.scala @@ -12,13 +12,17 @@ package org.locationtech.geomesa.convert2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= import java.io.{Closeable, InputStream} >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -137,6 +141,8 @@ import java.io.{Closeable, InputStream} >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main import com.codahale.metrics.Counter import com.typesafe.config.Config import com.typesafe.scalalogging.{LazyLogging, StrictLogging} @@ -197,6 +203,7 @@ trait SimpleFeatureConverter extends Closeable with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -349,12 +356,17 @@ trait SimpleFeatureConverter extends Closeable with LazyLogging { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= def createEvaluationContext(globalParams: Map[String, Any], success: Counter, failure: Counter): EvaluationContext = // TODO remove default impl in next major release new DelegatingEvaluationContext(createEvaluationContext(globalParams))(success, failure) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main /** * Java API for `createEvaluationContext` diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/composite/CompositeConverter.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/composite/CompositeConverter.scala index 64a244742261..07a339d35c9d 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/composite/CompositeConverter.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/composite/CompositeConverter.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.convert2.composite <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -165,11 +166,16 @@ import java.nio.charset.StandardCharsets >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import java.io.{ByteArrayInputStream, InputStream} import java.nio.charset.StandardCharsets >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main import com.codahale.metrics.Counter import org.apache.commons.io.IOUtils import org.locationtech.geomesa.convert.EvaluationContext diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/package.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/package.scala index ac9a10fd32e1..4295924afb8d 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/package.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/package.scala @@ -16,6 +16,7 @@ import org.locationtech.geomesa.convert.Modes.{ErrorMode, ParseMode} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -165,11 +166,16 @@ import org.locationtech.geomesa.convert.Modes.{ErrorMode, ParseMode} >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import org.locationtech.geomesa.convert.EvaluationContext import org.locationtech.geomesa.convert.Modes.{ErrorMode, ParseMode} import org.locationtech.geomesa.convert2.AbstractConverter.FieldApiError >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.convert2.transforms.Expression import org.locationtech.geomesa.utils.collection.CloseableIterator @@ -201,6 +207,7 @@ package object convert2 { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -262,6 +269,9 @@ package object convert2 { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main // TODO remove default impl in next major release // this will be caught and handled by the evaluation context def fieldArg: Option[Array[AnyRef] => AnyRef] = throw FieldApiError @@ -272,6 +282,7 @@ package object convert2 { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -363,6 +374,9 @@ package object convert2 { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } trait ConverterOptions { diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/CollectionFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/CollectionFunctionFactory.scala index 5ff3964e6d58..c7006c3d5583 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/CollectionFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/CollectionFunctionFactory.scala @@ -12,13 +12,17 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= import java.util.{Collections, UUID} >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -137,6 +141,8 @@ import java.util.{Collections, UUID} >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.convert.EvaluationContext import org.locationtech.geomesa.convert2.transforms.CollectionFunctionFactory.{CollectionParsing, TransformList} import org.locationtech.geomesa.convert2.transforms.Expression.LiteralString @@ -417,6 +423,7 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= } <<<<<<< HEAD @@ -2395,6 +2402,8 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2421,6 +2430,7 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -7877,6 +7887,11 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti ======= >>>>>>> 1aa0b19c24 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +======= +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -7897,6 +7912,7 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 120815d0b0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD ======= @@ -7951,11 +7967,18 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> eb23a24e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> 3e47057994 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD @@ -7982,6 +8005,7 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 9d708b240a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -8921,6 +8945,8 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti ======= >>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -8931,6 +8957,7 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8959,12 +8986,17 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9022,6 +9054,9 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti ======= >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9037,6 +9072,7 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -9053,9 +9089,14 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti >>>>>>> e6e1f4bdd5 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5e763f098e (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -10890,6 +10931,10 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti >>>>>>> 9b3fdf0389 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD @@ -10897,6 +10942,7 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 98a03c5861 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> bb7e8ccf4a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -10982,10 +11028,22 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti ======= ======= ======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 83670fc938 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 8f9133d355 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -11004,12 +11062,17 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11028,11 +11091,16 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4f0e2712ab (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 768fd6ea12 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11051,11 +11119,16 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11082,6 +11155,13 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti ======= ======= ======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -11090,17 +11170,21 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti <<<<<<< HEAD >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 91bbd30a52 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9e19addc31 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e762caca54 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> ff17a571bc (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -12569,6 +12653,10 @@ class CollectionFunctionFactory extends TransformerFunctionFactory with Collecti ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } object CollectionFunctionFactory { diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/DateFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/DateFunctionFactory.scala index acfaaf5352ef..b2a9d04b6184 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/DateFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/DateFunctionFactory.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -73,6 +74,9 @@ package org.locationtech.geomesa.convert2.transforms ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main import java.time.ZoneOffset import java.time.format.DateTimeFormatter import java.util.{Date, Locale} @@ -80,6 +84,7 @@ import java.util.{Date, Locale} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -171,6 +176,9 @@ import java.util.{Date, Locale} ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main import org.locationtech.geomesa.convert2.transforms.DateFunctionFactory.{CustomFormatDateParser, DateToString, StandardDateParser} import org.locationtech.geomesa.convert2.transforms.Expression.LiteralString import org.locationtech.geomesa.convert2.transforms.TransformerFunction.NamedTransformerFunction diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/EncodingFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/EncodingFunctionFactory.scala index 644fe0d12b2d..fb24fc2c7f0a 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/EncodingFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/EncodingFunctionFactory.scala @@ -17,6 +17,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -24,6 +27,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -434,6 +438,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -441,6 +447,7 @@ <<<<<<< HEAD >>>>>>> 0d4c68bda (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 919559e486 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD @@ -455,12 +462,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -809,6 +819,8 @@ >>>>>>> 5057b7d518 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -821,6 +833,7 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import java.nio.charset.StandardCharsets >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) @@ -940,6 +953,11 @@ import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 5057b7d518 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +import java.nio.charset.StandardCharsets +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main import java.util.Base64 class EncodingFunctionFactory extends TransformerFunctionFactory { diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/EnrichmentCacheFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/EnrichmentCacheFunctionFactory.scala index f15e1fa6e984..17d01fe06dd8 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/EnrichmentCacheFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/EnrichmentCacheFunctionFactory.scala @@ -30,6 +30,9 @@ object EnrichmentCacheFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= ======= ======= ======= @@ -39,6 +42,13 @@ object EnrichmentCacheFunctionFactory { val cache = ec.cache(args(0).asInstanceOf[String]) cache.get(Array(args(1).asInstanceOf[String], args(2).asInstanceOf[String])) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main + } + + override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = { + val cache = ec.cache(args(0).asInstanceOf[String]) + cache.get(Array(args(1).asInstanceOf[String], args(2).asInstanceOf[String])) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) } diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/Expression.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/Expression.scala index d4b54148df8f..a55f1c28480a 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/Expression.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/Expression.scala @@ -19,6 +19,7 @@ sealed trait Expression extends ContextDependent[Expression] { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -111,6 +112,17 @@ sealed trait Expression extends ContextDependent[Expression] { */ def apply(args: Array[_ <: AnyRef]): AnyRef ======= +======= +>>>>>>> locationtech-main + + /** + * Evaluate the expression against an input row + * + * @param args arguments + * @return + */ + def apply(args: Array[_ <: AnyRef]): AnyRef +======= /** * Evaluate the expression against an input row @@ -155,6 +167,18 @@ sealed trait Expression extends ContextDependent[Expression] { def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = withContext(ec).apply(args.asInstanceOf[Array[AnyRef]]) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) + + /** + * Evaluate the expression against an input + * + * @param args arguments + * @param ec evaluation context + * @return + */ + @deprecated("Use `withContext` and `apply`") + def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = + withContext(ec).apply(args.asInstanceOf[Array[AnyRef]]) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD ======= >>>>>>> 397a13ab3c (GEOMESA-3071 Move all converter state into evaluation context) @@ -594,6 +618,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 78e21a715 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2877,6 +2902,12 @@ object Expression { >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> daa600442f (GEOMESA-3071 Move all converter state into evaluation context) ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -2905,6 +2936,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6289007008 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 3616f751a9 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2973,11 +3005,16 @@ object Expression { ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -2994,6 +3031,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -3760,6 +3798,12 @@ object Expression { >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3776,6 +3820,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9064032df (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4112,10 +4157,18 @@ object Expression { <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 536e4c2941 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -7597,10 +7650,19 @@ object Expression { ======= ======= ======= +>>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= +<<<<<<< HEAD >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> d9a9062a0 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -7674,10 +7736,22 @@ object Expression { ======= ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8e80535d (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 3e85ab9274 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -7690,6 +7764,8 @@ object Expression { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -7699,6 +7775,7 @@ object Expression { <<<<<<< HEAD >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 81b8eb5ae (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 55324ccde8 (GEOMESA-3071 Move all converter state into evaluation context) @@ -7711,11 +7788,14 @@ object Expression { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 59c99fa93 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') @@ -7879,6 +7959,10 @@ object Expression { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case class FunctionExpression(f: TransformerFunction, arguments: Array[Expression]) extends Expression { @volatile private var contextDependent: Int = -1 @@ -7903,6 +7987,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= @@ -8132,6 +8217,9 @@ object Expression { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main case class FunctionExpression( f: TransformerFunction, arguments: Array[Expression], @@ -8143,6 +8231,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8194,6 +8283,8 @@ object Expression { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -8288,6 +8379,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> a5946358db (GEOMESA-3071 Move all converter state into evaluation context) @@ -9593,11 +9685,14 @@ object Expression { ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -9608,6 +9703,12 @@ object Expression { >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -9617,6 +9718,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -9895,6 +9997,8 @@ object Expression { >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -9905,6 +10009,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10207,6 +10312,8 @@ object Expression { >>>>>>> locationtech-main ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) @@ -10217,6 +10324,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 24df6d87c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -10511,12 +10619,15 @@ object Expression { ======= >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 01cd7ef692 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -12158,6 +12269,8 @@ object Expression { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) @@ -12165,6 +12278,7 @@ object Expression { >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -15249,6 +15363,10 @@ object Expression { ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main override def apply(args: Array[_ <: AnyRef]): AnyRef = f.apply(arguments.map(_.apply(args))) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -15268,6 +15386,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -15285,6 +15404,9 @@ object Expression { >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -15300,6 +15422,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD ======= @@ -15411,10 +15534,17 @@ object Expression { ======= ======= ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7cd2c4188b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 86e5e3ea48 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -15430,6 +15560,10 @@ object Expression { >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -15437,6 +15571,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5ba418ba6c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 9ac92c0689 (GEOMESA-3071 Move all converter state into evaluation context) @@ -16373,9 +16508,24 @@ object Expression { ======= ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d9a9062a0 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> da62907bfd (GEOMESA-3071 Move all converter state into evaluation context) @@ -16417,9 +16567,16 @@ object Expression { ======= ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> 9cf623a4be (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 364812dd7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -16565,20 +16722,28 @@ object Expression { ======= ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main +======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +======= +>>>>>>> locationtech-main override def apply(args: Array[_ <: AnyRef]): AnyRef = f.apply(arguments.map(_.apply(args))) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 2024fa80f3 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -16587,21 +16752,28 @@ object Expression { ======= ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 319ecdc02f (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> e5009bc661 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 5fae301729 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 14ffb5a7d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -16680,6 +16852,10 @@ object Expression { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main override def withContext(ec: EvaluationContext): Expression = { // this code is thread-safe, in that it will ensure correctness, but does not guarantee // that the dependency check is only performed once @@ -16791,6 +16967,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') @@ -16986,12 +17163,15 @@ object Expression { ======= >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -17002,12 +17182,15 @@ object Expression { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -17018,6 +17201,8 @@ object Expression { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -17026,6 +17211,7 @@ object Expression { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -17187,6 +17373,10 @@ object Expression { >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -17198,6 +17388,7 @@ object Expression { ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> location-main ======= <<<<<<< HEAD @@ -17312,6 +17503,8 @@ object Expression { >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -17320,6 +17513,7 @@ object Expression { ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -17377,12 +17571,15 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -17447,6 +17644,11 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -17454,6 +17656,7 @@ object Expression { >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17480,10 +17683,15 @@ object Expression { >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> location-main @@ -17523,9 +17731,14 @@ object Expression { >>>>>>> 364812dd7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main ======= ======= @@ -17620,6 +17833,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -17655,6 +17869,11 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) @@ -17663,6 +17882,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -24808,6 +25028,13 @@ object Expression { new FunctionExpression(fwc, awc, 1) ======= FunctionExpression(fwc, awc, 1) +======= +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) + new FunctionExpression(fwc, awc, 1) +======= + FunctionExpression(fwc, awc, 1) +>>>>>>> locationtech-main >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -24829,6 +25056,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 1261eeea04 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -25487,6 +25715,13 @@ object Expression { >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -25503,6 +25738,7 @@ object Expression { >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +<<<<<<< HEAD >>>>>>> a5946358db (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -25518,6 +25754,9 @@ object Expression { >>>>>>> ca4bea4f41 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 3616f751a9 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main new FunctionExpression(fwc, awc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -25530,6 +25769,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3616f751a9 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6289007008 (GEOMESA-3071 Move all converter state into evaluation context) @@ -25646,6 +25886,8 @@ object Expression { ======= >>>>>>> 364812dd7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -25654,6 +25896,9 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -25662,6 +25907,7 @@ object Expression { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6ac55e1ef (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -25715,6 +25961,9 @@ object Expression { >>>>>>> 364812dd7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f038e6d420 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> locationtech-main new FunctionExpression(fwc, awc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -25735,6 +25984,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -25853,6 +26103,13 @@ object Expression { ======= ======= >>>>>>> 1cdce777e4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= new FunctionExpression(fwc, awc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -25881,6 +26138,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1cdce777e4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -26028,10 +26286,20 @@ object Expression { >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 1c5c649655 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= ======= new FunctionExpression(fwc, awc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -26040,6 +26308,9 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -26047,6 +26318,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e734e4d06 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -26065,12 +26337,21 @@ object Expression { <<<<<<< HEAD ======= ======= +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -26086,6 +26367,12 @@ object Expression { ======= >>>>>>> c8e80535d (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= ======= new FunctionExpression(fwc, awc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -26095,6 +26382,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 59d9fe5f6a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -29745,6 +30033,8 @@ object Expression { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -29755,6 +30045,7 @@ object Expression { <<<<<<< HEAD >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 2f79835b1b (GEOMESA-3071 Move all converter state into evaluation context) @@ -30519,6 +30810,8 @@ object Expression { ======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= ======= ======= new FunctionExpression(fwc, awc, 1) @@ -30526,6 +30819,7 @@ object Expression { >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') >>>>>>> 59c99fa93 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -30701,6 +30995,10 @@ object Expression { new FunctionExpression(fwc, awc, 1) >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= + new FunctionExpression(fwc, awc, 1) +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } else { if (!fwc.eq(f)) { contextDependent = 1 @@ -30822,6 +31120,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fa3a402d4 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -32453,20 +32752,28 @@ object Expression { >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 8871ac11cf (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -32554,6 +32861,8 @@ object Expression { >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -32566,6 +32875,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -32983,6 +33293,10 @@ object Expression { ======= >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -33012,6 +33326,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 98e25fe678 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -33392,6 +33707,12 @@ object Expression { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD @@ -33407,6 +33728,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e8ce62d0d6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -35225,11 +35547,17 @@ object Expression { >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> daa600442f (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -35253,9 +35581,18 @@ object Expression { ======= ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 41b057b6f8 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -35265,9 +35602,14 @@ object Expression { ======= ======= ======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -35282,9 +35624,16 @@ object Expression { ======= ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -35299,9 +35648,16 @@ object Expression { ======= ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7bbce86d17 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -35312,6 +35668,12 @@ object Expression { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main if (contextDependent == 0) { this } else { new FunctionExpression(fwc, awc, 1) } } } @@ -35330,6 +35692,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c83e8187d (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -35409,6 +35772,8 @@ object Expression { >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ======= if (contextDependent == 0) { this } else { FunctionExpression(fwc, awc, 1) } } @@ -35421,6 +35786,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -35460,6 +35826,8 @@ object Expression { ======= <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -35493,6 +35861,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 67d0823d3f (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -35553,9 +35922,12 @@ object Expression { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) @@ -35564,6 +35936,12 @@ object Expression { >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= +======= +>>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -35571,6 +35949,7 @@ object Expression { >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5fae301729 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -36189,6 +36568,8 @@ object Expression { >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -36206,6 +36587,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9064032df (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -36248,6 +36630,8 @@ object Expression { >>>>>>> locationtech-main ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -36269,6 +36653,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -36301,6 +36686,8 @@ object Expression { >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) @@ -36314,6 +36701,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -36735,6 +37123,8 @@ object Expression { ======= >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -36742,6 +37132,9 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -36753,10 +37146,13 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -36764,6 +37160,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= <<<<<<< HEAD @@ -36842,6 +37239,8 @@ object Expression { >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main if (contextDependent == 0) { this } else { new FunctionExpression(fwc, awc, 1) } } } @@ -36920,6 +37319,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dab28922a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -37274,6 +37674,8 @@ object Expression { ======= >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -37281,6 +37683,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9877b09a14 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main @@ -37311,17 +37714,23 @@ object Expression { >>>>>>> locationtech-main >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +======= +>>>>>>> locationtech-main >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> 1562748d0b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f7f5195405 (GEOMESA-3071 Move all converter state into evaluation context) @@ -37544,6 +37953,8 @@ object Expression { ======= >>>>>>> 01cd7ef692 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -37573,6 +37984,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 98e25fe678 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -37867,6 +38279,12 @@ object Expression { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD @@ -37882,6 +38300,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e8ce62d0d6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -37994,6 +38413,11 @@ object Expression { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -38011,6 +38435,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4108c4b7d (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -38184,6 +38609,14 @@ object Expression { >>>>>>> c9d6a275e8 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -38194,6 +38627,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0166e9455b (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -38218,6 +38652,10 @@ object Expression { >>>>>>> d9cbd16a76 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -38229,6 +38667,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e734e4d064 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -38278,6 +38717,12 @@ object Expression { >>>>>>> 5f17de37ee (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -38291,6 +38736,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -38349,6 +38795,12 @@ object Expression { >>>>>>> 319ecdc02f (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -38360,6 +38812,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -40979,9 +41432,12 @@ object Expression { <<<<<<< HEAD ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -44575,6 +45031,8 @@ object Expression { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main override def dependencies(stack: Set[Field], fieldMap: Map[String, Field]): Set[Field] = arguments.flatMap(_.dependencies(stack, fieldMap)).toSet override def children(): Seq[Expression] = arguments @@ -44685,6 +45143,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 78e21a715 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -46968,6 +47427,12 @@ object Expression { >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> daa600442f (GEOMESA-3071 Move all converter state into evaluation context) ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -46996,6 +47461,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6289007008 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 3616f751a9 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -47064,11 +47530,16 @@ object Expression { ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -47085,6 +47556,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -47851,6 +48323,12 @@ object Expression { >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -47867,6 +48345,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9064032df (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -48203,10 +48682,18 @@ object Expression { <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 536e4c2941 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -51688,10 +52175,19 @@ object Expression { ======= ======= ======= +>>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= +<<<<<<< HEAD >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> d9a9062a0 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -51765,10 +52261,22 @@ object Expression { ======= ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8e80535d (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 3e85ab9274 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -51781,6 +52289,8 @@ object Expression { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -51790,6 +52300,7 @@ object Expression { <<<<<<< HEAD >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 81b8eb5ae (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 55324ccde8 (GEOMESA-3071 Move all converter state into evaluation context) @@ -51802,11 +52313,14 @@ object Expression { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 59c99fa93 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') @@ -51970,6 +52484,10 @@ object Expression { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case class TryExpression(toTry: Expression, fallback: Expression) extends Expression { @volatile private var contextDependent: Int = -1 @@ -51994,6 +52512,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= @@ -52223,6 +52742,9 @@ object Expression { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main case class TryExpression( toTry: Expression, fallback: Expression, @@ -52234,6 +52756,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -52285,6 +52808,8 @@ object Expression { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -52379,6 +52904,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> a5946358db (GEOMESA-3071 Move all converter state into evaluation context) @@ -53684,11 +54210,14 @@ object Expression { ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -53699,6 +54228,12 @@ object Expression { >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -53708,6 +54243,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -53986,6 +54522,8 @@ object Expression { >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -53996,6 +54534,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -54298,6 +54837,8 @@ object Expression { >>>>>>> locationtech-main ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) @@ -54308,6 +54849,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 24df6d87c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -54602,12 +55144,15 @@ object Expression { ======= >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 01cd7ef692 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -56249,6 +56794,8 @@ object Expression { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) @@ -56256,6 +56803,7 @@ object Expression { >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -59340,6 +59888,10 @@ object Expression { ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main override def apply(args: Array[_ <: AnyRef]): AnyRef = Try(toTry.apply(args)).getOrElse(fallback.apply(args)) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -59359,6 +59911,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -59376,6 +59929,9 @@ object Expression { >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -59391,6 +59947,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD ======= @@ -59502,10 +60059,17 @@ object Expression { ======= ======= ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7cd2c4188b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 86e5e3ea48 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -59521,6 +60085,10 @@ object Expression { >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -59528,6 +60096,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5ba418ba6c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 9ac92c0689 (GEOMESA-3071 Move all converter state into evaluation context) @@ -60464,9 +61033,24 @@ object Expression { ======= ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d9a9062a0 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> da62907bfd (GEOMESA-3071 Move all converter state into evaluation context) @@ -60508,9 +61092,16 @@ object Expression { ======= ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> 9cf623a4be (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 364812dd7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -60656,20 +61247,28 @@ object Expression { ======= ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main +======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +======= +>>>>>>> locationtech-main override def apply(args: Array[_ <: AnyRef]): AnyRef = Try(toTry.apply(args)).getOrElse(fallback.apply(args)) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 2024fa80f3 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -60678,21 +61277,28 @@ object Expression { ======= ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 319ecdc02f (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> e5009bc661 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 5fae301729 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 14ffb5a7d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -60771,6 +61377,10 @@ object Expression { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main override def withContext(ec: EvaluationContext): Expression = { // this code is thread-safe, in that it will ensure correctness, but does not guarantee // that the dependency check is only performed once @@ -60882,6 +61492,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fa3a402d4 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -62276,6 +62887,11 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) @@ -62283,16 +62899,20 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -62358,6 +62978,8 @@ object Expression { >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -62370,6 +62992,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -62557,6 +63180,10 @@ object Expression { >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -62587,6 +63214,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -62849,11 +63477,14 @@ object Expression { ======= <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD @@ -62938,6 +63569,10 @@ object Expression { ======= <<<<<<< HEAD ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -62945,6 +63580,7 @@ object Expression { >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -66671,11 +67307,26 @@ object Expression { >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e734e4d064 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> a79eaecf5b (GEOMESA-3071 Move all converter state into evaluation context) @@ -66702,11 +67353,18 @@ object Expression { >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -66734,11 +67392,18 @@ object Expression { >>>>>>> 7bbce86d17 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 2f79835b1b (GEOMESA-3071 Move all converter state into evaluation context) @@ -67570,6 +68235,12 @@ object Expression { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main new TryExpression(twc, fwc, 1) } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } @@ -67591,6 +68262,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e8cc4971c6 (Merge branch 'feature/postgis-fixes') ======= @@ -67653,6 +68325,8 @@ object Expression { ======= >>>>>>> ec6d06b576 (Merge branch 'feature/postgis-fixes') >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= TryExpression(twc, fwc, 1) <<<<<<< HEAD @@ -67674,6 +68348,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD ======= +<<<<<<< HEAD new TryExpression(twc, fwc, 1) >>>>>>> 1108247cc5 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) } else { @@ -67717,6 +68392,35 @@ object Expression { new TryExpression(twc, fwc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff9 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +<<<<<<< HEAD +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) + new TryExpression(twc, fwc, 1) +>>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } if (contextDependent == 0) { this } else { new TryExpression(twc, fwc, 1) } @@ -67726,6 +68430,7 @@ object Expression { <<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dd5d6434b0 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -67758,16 +68463,49 @@ object Expression { >>>>>>> 059393960c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +======= + +>>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD +======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main ======= new TryExpression(twc, fwc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } if (contextDependent == 0) { this } else { new TryExpression(twc, fwc, 1) } @@ -67779,14 +68517,18 @@ object Expression { <<<<<<< HEAD >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 686339d050 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b6c4628dba (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -67838,10 +68580,21 @@ object Expression { ======= ======= ======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= new TryExpression(twc, fwc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> locationtech-main } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } if (contextDependent == 0) { this } else { new TryExpression(twc, fwc, 1) } @@ -67853,18 +68606,27 @@ object Expression { <<<<<<< HEAD >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 149b7a7809 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7cd2c4188b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } @@ -67879,21 +68641,28 @@ object Expression { <<<<<<< HEAD >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5ba418ba6c (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 5e8ce12ec9 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= ======= ======= new TryExpression(twc, fwc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> aada4d63cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } @@ -68942,6 +69711,8 @@ object Expression { ======= new TryExpression(twc, fwc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } @@ -68955,6 +69726,7 @@ object Expression { >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 8caee74520 (GEOMESA-3071 Move all converter state into evaluation context) @@ -68965,12 +69737,15 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3ff426afc7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -68985,6 +69760,9 @@ object Expression { <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } @@ -69000,6 +69778,7 @@ object Expression { >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0166e9455b (GEOMESA-3071 Move all converter state into evaluation context) @@ -69010,6 +69789,8 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= @@ -69020,6 +69801,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -69037,6 +69819,8 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) } else { @@ -69053,6 +69837,7 @@ object Expression { >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e734e4d064 (GEOMESA-3071 Move all converter state into evaluation context) @@ -69063,6 +69848,8 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= @@ -69073,6 +69860,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -69090,6 +69878,8 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -69110,6 +69900,7 @@ object Expression { >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d1cf3ad8b5 (GEOMESA-3071 Move all converter state into evaluation context) @@ -69120,6 +69911,8 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -69133,6 +69926,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -69167,6 +69961,10 @@ object Expression { >>>>>>> 476df18562 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> locationtech-main ======= new TryExpression(twc, fwc, 1) >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -69183,6 +69981,7 @@ object Expression { >>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 25e967804c (GEOMESA-3071 Move all converter state into evaluation context) @@ -69193,12 +69992,15 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 52c9856ea3 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -69213,6 +70015,9 @@ object Expression { <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) } else { contextDependent = if (twc.eq(toTry) && fwc.eq(fallback)) { 0 } else { 1 } @@ -69228,6 +70033,7 @@ object Expression { >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -69238,6 +70044,8 @@ object Expression { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= @@ -69249,6 +70057,7 @@ object Expression { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -75769,6 +76578,10 @@ object Expression { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main override def dependencies(stack: Set[Field], fieldMap: Map[String, Field]): Set[Field] = toTry.dependencies(stack, fieldMap) ++ fallback.dependencies(stack, fieldMap) override def children(): Seq[Expression] = Seq(toTry, fallback) diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/GeometryFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/GeometryFunctionFactory.scala index 85a64ee49ebd..e1a3db1e7090 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/GeometryFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/GeometryFunctionFactory.scala @@ -12,13 +12,17 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= import java.util.concurrent.ConcurrentHashMap >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -137,6 +141,8 @@ import java.util.concurrent.ConcurrentHashMap >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main import org.geotools.geometry.jts.{JTS, JTSFactoryFinder} import org.geotools.referencing.CRS import org.locationtech.geomesa.convert2.transforms.TransformerFunction.NamedTransformerFunction @@ -257,6 +263,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fa3a402d4 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -1600,6 +1607,11 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) @@ -1607,16 +1619,20 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1682,6 +1698,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -1692,6 +1710,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -1808,6 +1827,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 3978e210e2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -1834,6 +1857,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -2023,11 +2047,14 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD >>>>>>> eb23a24e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -2108,6 +2135,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= <<<<<<< HEAD ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -2115,6 +2146,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -5566,11 +5598,26 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e734e4d064 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> a79eaecf5b (GEOMESA-3071 Move all converter state into evaluation context) @@ -5598,11 +5645,18 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> eb23a24e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9e8a3c11c3 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 8a671ae630 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -5629,11 +5683,18 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 7bbce86d17 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 2f79835b1b (GEOMESA-3071 Move all converter state into evaluation context) @@ -6450,6 +6511,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case Array(x: Number, y: Number) => gf.createPoint(coord(x, y)) case Array(x: Number, y: Number, z: Number) => gf.createPoint(coordZ(x, y, z)) case Array(x: Number, y: Number, z: Number, m: Number) => gf.createPoint(coordZM(x, y, z, m)) @@ -6469,6 +6536,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e8cc4971c6 (Merge branch 'feature/postgis-fixes') ======= @@ -6531,6 +6599,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> ec6d06b576 (Merge branch 'feature/postgis-fixes') >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= case Array(x: Float, y: Double) => gf.createPoint(new Coordinate(x, y)) case Array(x: Double, y: Float) => gf.createPoint(new Coordinate(x, y)) @@ -6543,6 +6613,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7313,6 +7384,9 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> 9cf623a4be (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) @@ -7326,6 +7400,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -7376,6 +7451,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> a35efac12e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -7389,6 +7466,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -7624,6 +7702,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> b9e5c92638 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 9cf623a4be (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= >>>>>>> locationtech-main case Array(x: Number, y: Number) => gf.createPoint(new Coordinate(x.doubleValue, y.doubleValue)) case Array(g: String) => WKTUtils.read(g).asInstanceOf[Point] @@ -7633,6 +7715,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7657,6 +7740,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= case Array(x: Number, y: Number) => gf.createPoint(coord(x, y)) case Array(x: Number, y: Number, z: Number) => gf.createPoint(coordZ(x, y, z)) @@ -7733,6 +7818,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -7895,6 +7981,11 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -7910,6 +8001,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -7958,6 +8050,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -7968,6 +8066,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9e8a3c11c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -8526,9 +8625,18 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD ======= ======= +======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null <<<<<<< HEAD @@ -8537,6 +8645,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 87bf55340 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -8688,6 +8797,15 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= case Array(x: Float, y: Double) => gf.createPoint(new Coordinate(x, y)) case Array(x: Double, y: Float) => gf.createPoint(new Coordinate(x, y)) +======= + case Array(x: Float, y: Double) => gf.createPoint(new Coordinate(x, y)) + case Array(x: Double, y: Float) => gf.createPoint(new Coordinate(x, y)) + case Array(null) | Array(null, null) => null +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -8822,10 +8940,13 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -9004,6 +9125,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null <<<<<<< HEAD @@ -9011,11 +9134,14 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eee5d7ae15 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= case Array(x: Float, y: Double) => gf.createPoint(new Coordinate(x, y)) case Array(x: Double, y: Float) => gf.createPoint(new Coordinate(x, y)) @@ -9024,6 +9150,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> b1c506839 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 07a6a5c291 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -9034,6 +9161,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= case Array(null) | Array(null, null) => null >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -9053,6 +9182,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -10512,6 +10642,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> d86a5b91d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null @@ -10520,9 +10652,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 99fd8486a3 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= case Array(x: Float, y: Double) => gf.createPoint(new Coordinate(x, y)) @@ -10532,12 +10667,21 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d6616d893e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10550,9 +10694,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 98a03c5861 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> locationtech-main ======= @@ -10564,6 +10711,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> b1c506839 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> 28e2bfa2dc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= case Array(null) | Array(null, null) => null @@ -11744,6 +11892,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= case Array(null) | Array(null, null) => null >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11757,6 +11907,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 947761ec9b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -11873,6 +12024,9 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> dc9e876637 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null <<<<<<< HEAD @@ -11881,6 +12035,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0e2352ff05 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -11891,6 +12046,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= case Array(x: Float, y: Double) => gf.createPoint(new Coordinate(x, y)) @@ -11901,6 +12058,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -11973,6 +12131,13 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 6514df9383 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 664350d86f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= +======= +======= +>>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null <<<<<<< HEAD @@ -11983,6 +12148,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 83670fc938 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -11993,6 +12159,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> locationtech-main ======= @@ -12009,6 +12177,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -12115,6 +12284,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null <<<<<<< HEAD @@ -12125,6 +12300,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a7ca1d57e6 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -12135,6 +12311,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -12149,6 +12327,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -12672,6 +12851,9 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null <<<<<<< HEAD @@ -12683,6 +12865,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8170c2c54a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD @@ -12690,6 +12873,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> locationtech-main @@ -12708,10 +12893,13 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 516fe7e9c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= case Array(null) | Array(null, null) => null >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -12723,6 +12911,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d94c03a98e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -12748,6 +12937,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null @@ -12757,6 +12948,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a83aceac86 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -12767,6 +12959,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= ======= case Array(x: Float, y: Double) => gf.createPoint(new Coordinate(x, y)) @@ -12777,6 +12971,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -17604,6 +17799,15 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= + case args if args.nonEmpty && args.lengthCompare(4) <= 0 && args.forall(_ == null) => null +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case args => throw new IllegalArgumentException(s"Invalid point conversion argument: ${args.mkString(",")}") } @@ -17662,6 +17866,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -17849,6 +18054,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD ======= @@ -17863,6 +18070,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -18373,6 +18581,11 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= >>>>>>> 49a5a0454f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> b1c506839 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -18407,6 +18620,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -22978,24 +23192,41 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 119231a668 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 99fd8486a3 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 778d4a3956 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +<<<<<<< HEAD +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d6616d893e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -23005,9 +23236,20 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 98a03c5861 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -23098,11 +23340,26 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 0e2352ff05 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 93ad8dd735 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 61208268cd (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 8f8384d50b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -23126,9 +23383,16 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -23144,6 +23408,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +>>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= ======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -23155,12 +23423,15 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4f0e2712ab (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 768fd6ea12 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -23170,17 +23441,21 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9e8a3c11c3 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 8a671ae630 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -23199,11 +23474,16 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bf90e5fa00 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 6436af5398 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -23212,6 +23492,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> c37a34dcb9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -23220,6 +23502,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 91bbd30a52 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9e19addc31 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -24467,6 +24750,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case Array(x: java.util.List[_], y: java.util.List[_]) => val coords = Array.ofDim[Coordinate](x.size) var i = 0 @@ -24523,6 +24812,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -25168,6 +25458,11 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD @@ -25177,6 +25472,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -25375,6 +25671,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> locationtech-main ======= >>>>>>> 3978e210e2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -25392,6 +25690,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -25439,6 +25738,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 1938bb0efa (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> a65a6b5ef9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -25452,6 +25753,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> location-main @@ -25539,12 +25841,19 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 05331f7735 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -25993,6 +26302,11 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 3e47057994 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -26045,6 +26359,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -26334,6 +26649,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1938bb0efa (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -26372,6 +26691,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 60ee91581e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -28316,11 +28636,14 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -31313,6 +31636,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= ======= @@ -31329,6 +31656,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main @@ -33802,6 +34130,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main +======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -33811,6 +34143,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 67b361c856 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> f7cef54062 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -33831,12 +34164,17 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d6616d893e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 97df2db3cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -34863,6 +35201,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> eb23a24e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD @@ -34871,6 +35213,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 23c024179 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 250f01786f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -34885,11 +35228,14 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> 0833709340 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dc9e876637 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> a910ae135 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -35141,10 +35487,17 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 8451cc58ed (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 433f345a62 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> f5f0946155 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -35255,9 +35608,16 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3978e210e2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -35272,19 +35632,31 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -35299,9 +35671,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -35311,17 +35686,25 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c37a34dcb9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case Array(null) => null case args => throw new IllegalArgumentException(s"Invalid multipoint conversion argument: ${args.mkString(",")}") } @@ -35375,6 +35758,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -35562,6 +35946,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD ======= @@ -35576,6 +35962,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -36086,6 +36473,11 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= >>>>>>> 49a5a0454f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> b1c506839 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -36120,6 +36512,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -40691,24 +41084,41 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 119231a668 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 99fd8486a3 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 778d4a3956 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +<<<<<<< HEAD +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> d6616d893e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -40718,9 +41128,20 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 98a03c5861 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -40811,11 +41232,26 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 0e2352ff05 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 93ad8dd735 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 61208268cd (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 8f8384d50b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -40839,9 +41275,16 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -40857,6 +41300,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +>>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= ======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -40868,12 +41315,15 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4f0e2712ab (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 768fd6ea12 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -40883,17 +41333,21 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9e8a3c11c3 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 8a671ae630 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -40912,11 +41366,16 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bf90e5fa00 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 6436af5398 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -40925,6 +41384,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> c37a34dcb9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -40933,6 +41394,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 91bbd30a52 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9e19addc31 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -42180,6 +42642,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case Array(x: java.util.List[_], y: java.util.List[_]) => val coords = Array.ofDim[Coordinate](x.size) var i = 0 @@ -42236,6 +42704,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -42881,6 +43350,11 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD @@ -42890,6 +43364,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -43088,6 +43563,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> locationtech-main ======= >>>>>>> 3978e210e2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -43105,6 +43582,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -43152,6 +43630,8 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 1938bb0efa (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> a65a6b5ef9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -43165,6 +43645,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> location-main @@ -43252,12 +43733,19 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 05331f7735 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -43706,6 +44194,11 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 3e47057994 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -43758,6 +44251,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -44047,6 +44541,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1938bb0efa (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -44085,6 +44583,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 60ee91581e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -46029,11 +46528,14 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -49026,6 +49528,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= ======= @@ -49042,6 +49548,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main @@ -51515,6 +52022,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main +======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -51524,6 +52035,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 67b361c856 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> f7cef54062 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -51544,12 +52056,17 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d6616d893e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 97df2db3cf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -52576,6 +53093,10 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> eb23a24e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD @@ -52584,6 +53105,7 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 23c024179 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 250f01786f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -52598,11 +53120,14 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= >>>>>>> 0833709340 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dc9e876637 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> a910ae135 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -52854,10 +53379,17 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { >>>>>>> 8451cc58ed (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 433f345a62 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> f5f0946155 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -52968,9 +53500,16 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3978e210e2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -52985,19 +53524,31 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { ======= ======= ======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -53012,9 +53563,12 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -53024,17 +53578,25 @@ class GeometryFunctionFactory extends TransformerFunctionFactory { <<<<<<< HEAD >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c37a34dcb9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case Array(null) => null case args => throw new IllegalArgumentException(s"Invalid linestring conversion argument: ${args.mkString(",")}") } diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/IdFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/IdFunctionFactory.scala index 159594385875..ea5f76d40c97 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/IdFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/IdFunctionFactory.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import com.google.common.hash.Hashing >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) @@ -126,6 +127,11 @@ import com.google.common.hash.Hashing import com.google.common.hash.Hashing >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 5057b7d518 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +import com.google.common.hash.Hashing +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging import org.apache.commons.codec.binary.Base64 <<<<<<< HEAD @@ -140,6 +146,7 @@ import org.apache.commons.codec.digest.MurmurHash3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1532f2313 (GEOMESA-3254 Add Bloop build support) ======= @@ -267,6 +274,10 @@ import org.apache.commons.codec.digest.MurmurHash3 ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main import org.locationtech.geomesa.convert2.transforms.TransformerFunction.NamedTransformerFunction import org.locationtech.geomesa.curve.TimePeriod import org.locationtech.geomesa.utils.index.ByteArrays @@ -279,6 +290,7 @@ import java.security.MessageDigest <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -391,6 +403,10 @@ import java.security.MessageDigest ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 5057b7d518 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main import java.util.{Date, UUID} import scala.util.control.NonFatal @@ -402,9 +418,16 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= ======= ======= +======= + + private val murmur3_128Hashing = Hashing.murmur3_128() +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main private val murmur3_128Hashing = Hashing.murmur3_128() >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) @@ -626,6 +649,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -2814,11 +2838,16 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= private val hasher = Hashing.md5() override def apply(args: Array[AnyRef]): AnyRef = hasher.hashBytes(args(0).asInstanceOf[Array[Byte]]).toString +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } private val murmur3_32: TransformerFunction = new NamedTransformerFunction(Seq("murmur3_32"), pure = true) { @@ -2871,6 +2900,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> baa52efeb2 (GEOMESA-3071 Move all converter state into evaluation context) @@ -8256,6 +8286,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> daa600442f (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> fd97977f9c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main private val murmur3_128: TransformerFunction = new NamedTransformerFunction(Seq("murmur3_128", "murmur3_64"), pure = true) { private val hasher = Hashing.murmur3_128() @@ -8313,6 +8345,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -8433,6 +8466,10 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> 35b3ecb03 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -8440,6 +8477,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -8567,11 +8605,28 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> c399a7eef (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +<<<<<<< HEAD +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -8616,9 +8671,12 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e734e4d06 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -8631,12 +8689,18 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> d4cf7f1e24 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e08000604 (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD @@ -9069,6 +9133,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -9085,6 +9151,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6ac55e1ef7 (GEOMESA-3071 Move all converter state into evaluation context) @@ -9095,6 +9162,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -9107,6 +9176,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03967b3f4 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -9159,10 +9229,21 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -9227,12 +9308,22 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> locationtech-main ======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d1cf3ad8b5 (GEOMESA-3071 Move all converter state into evaluation context) @@ -9243,6 +9334,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -9250,6 +9343,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -9292,6 +9386,10 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> 2c3d834f45 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -9300,6 +9398,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2ac294bf (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -9321,6 +9420,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> 7bbce86d17 (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -9332,6 +9433,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -10524,6 +10626,12 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main // we've had some confusion around the names of these functions - the original function was murmur3_64, // which was then incorrectly renamed to murmur3_128. currently both these functions only return the first 64 // bits of a 128 bit hash. the full 128-bit hash is now called murmurHash3 to avoid name conflicts @@ -10534,6 +10642,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { case b: Array[Byte] => murmur3_128Hashing.hashBytes(b) case a => throw new IllegalArgumentException(s"Expected String or byte[] but got: $a") <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 849693a12 (GEOMESA-3071 Move all converter state into evaluation context) } sb.toString @@ -10579,12 +10688,15 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main } Long.box(hash.asLong()) // asLong gets only the first 64 bits even though the hash has 128 } private val murmur3_128 = TransformerFunction.pure("murmurHash3") { args => +<<<<<<< HEAD >>>>>>> 5057b7d518 (GEOMESA-3109 Json array to object converter function (#2788)) args(0) match { case s: String => murmur3_128Hashing.hashBytes(s.getBytes(StandardCharsets.UTF_8)).toString // toString results in hex @@ -16776,6 +16888,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= ======= ======= +======= +>>>>>>> locationtech-main args(0) match { case s: String => murmur3_128Hashing.hashBytes(s.getBytes(StandardCharsets.UTF_8)).toString // toString results in hex case b: Array[Byte] => murmur3_128Hashing.hashBytes(b).toString // toString results in hex @@ -16802,6 +16916,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ea9667862 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 7705eeb678 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -16814,6 +16929,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -16863,6 +16980,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -16877,10 +16995,16 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> e5c8c292cc (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +======= +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -16895,10 +17019,20 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> a5946358db (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD >>>>>>> da0dbd0f47 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main private val murmur3_128: TransformerFunction = new NamedTransformerFunction(Seq("murmur3_128", "murmur3_64"), pure = true) { private val hasher = Hashing.murmur3_128() @@ -16941,6 +17075,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eccc16ddf (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> ccaae60e3f (GEOMESA-3071 Move all converter state into evaluation context) @@ -16960,10 +17095,15 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> 0e53503f9d (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 063b0f26f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 6d26127ad6 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -16978,10 +17118,13 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> 0e53503f9d (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 71edb3b56 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 2a5fd16e2a (GEOMESA-3071 Move all converter state into evaluation context) @@ -17001,12 +17144,17 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { >>>>>>> e5c8c292cc (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d5f1bdf64 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> c17c73531f (GEOMESA-3109 Json array to object converter function (#2788)) @@ -17023,6 +17171,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -17038,6 +17188,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f7f519540 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 4bf896fb5b (GEOMESA-3071 Move all converter state into evaluation context) @@ -17050,6 +17201,8 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -17062,6 +17215,7 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { <<<<<<< HEAD >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1bc88f7e2 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 941c4a6320 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -17089,9 +17243,14 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= ======= ======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a38d1a4cc (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> e9b36da337 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -17104,12 +17263,15 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 849693a12 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> ade675c0aa (GEOMESA-3071 Move all converter state into evaluation context) @@ -17188,9 +17350,23 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= ======= ======= +>>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +<<<<<<< HEAD >>>>>>> 9cf623a4be (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 6938112d5 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -17221,10 +17397,15 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 21308670a5 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> cd8248bbd (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -17241,12 +17422,15 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> 7bbce86d17 (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d55e1bd3e2 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 81b8eb5ae (GEOMESA-3071 Move all converter state into evaluation context) @@ -17476,5 +17660,11 @@ class IdFunctionFactory extends TransformerFunctionFactory with LazyLogging { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } } diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/MiscFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/MiscFunctionFactory.scala index 6ea723a72f02..53c6b201e9ac 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/MiscFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/MiscFunctionFactory.scala @@ -43,13 +43,17 @@ object MiscFunctionFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= // noinspection ScalaDeprecation override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = ec.line >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -168,6 +172,8 @@ object MiscFunctionFactory { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/Predicate.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/Predicate.scala index c85e5bb059a6..ee613d65c3ca 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/Predicate.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/Predicate.scala @@ -17,6 +17,7 @@ sealed trait Predicate extends ContextDependent[Predicate] { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -73,6 +74,9 @@ sealed trait Predicate extends ContextDependent[Predicate] { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main def apply(args: Array[AnyRef]): Boolean @@ -82,6 +86,7 @@ sealed trait Predicate extends ContextDependent[Predicate] { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -174,6 +179,9 @@ sealed trait Predicate extends ContextDependent[Predicate] { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } object Predicate { diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/ScriptingFunctionFactory.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/ScriptingFunctionFactory.scala index ea416255bf41..6d5f8116e2a1 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/ScriptingFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/ScriptingFunctionFactory.scala @@ -25,6 +25,7 @@ import scala.collection.JavaConverters._ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -96,6 +97,9 @@ import scala.collection.JavaConverters._ ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main import org.apache.commons.io.filefilter.TrueFileFilter import org.apache.commons.io.{FileUtils, FilenameUtils, IOUtils} import org.locationtech.geomesa.convert2.transforms.TransformerFunction.NamedTransformerFunction @@ -104,6 +108,7 @@ import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemPropert <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import scala.collection.JavaConversions._ >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -219,6 +224,10 @@ import scala.collection.JavaConversions._ import scala.collection.JavaConversions._ >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +import scala.collection.JavaConversions._ +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main /** * Provides TransformerFunctions that execute javax.scripts compatible functions defined diff --git a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/TransformerFunction.scala b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/TransformerFunction.scala index 77d0c54dad99..b0ad33c0e2ac 100644 --- a/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/TransformerFunction.scala +++ b/geomesa-convert/geomesa-convert-common/src/main/scala/org/locationtech/geomesa/convert2/transforms/TransformerFunction.scala @@ -18,6 +18,7 @@ import java.util.ServiceLoader <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -91,11 +92,15 @@ import java.util.ServiceLoader ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.convert.EvaluationContext import org.locationtech.geomesa.convert.EvaluationContext.ContextDependent import org.locationtech.geomesa.convert2.AbstractConverter.TransformerFunctionApiError import org.locationtech.geomesa.convert2.transforms.TransformerFunction.DelegateFunction +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -164,6 +169,9 @@ import org.locationtech.geomesa.convert2.transforms.TransformerFunction.Delegate ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main trait TransformerFunction extends ContextDependent[TransformerFunction] { /** @@ -190,6 +198,7 @@ trait TransformerFunction extends ContextDependent[TransformerFunction] { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -342,12 +351,17 @@ trait TransformerFunction extends ContextDependent[TransformerFunction] { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= def apply(args: Array[AnyRef]): AnyRef = // this error will be caught and handled by the evaluation context throw TransformerFunctionApiError // TODO remove default impl in next major release >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main /** * Returns an uninitialized instance of this function @@ -392,6 +406,7 @@ object TransformerFunction { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = f(args) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -511,6 +526,11 @@ object TransformerFunction { override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = f(args) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = f(args) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main override def apply(args: Array[AnyRef]): AnyRef = f(args.asInstanceOf[Array[Any]]).asInstanceOf[AnyRef] } } @@ -521,6 +541,7 @@ object TransformerFunction { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = f(args) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -640,6 +661,11 @@ object TransformerFunction { override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = f(args) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = f(args) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main override def apply(args: Array[AnyRef]): AnyRef = f(args.asInstanceOf[Array[Any]]).asInstanceOf[AnyRef] } } @@ -652,6 +678,7 @@ object TransformerFunction { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -713,6 +740,9 @@ object TransformerFunction { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main override def apply(args: Array[AnyRef]): AnyRef = eval(args.asInstanceOf[Array[Any]])(null).asInstanceOf[AnyRef] // TODO remove this in next major release } @@ -728,6 +758,7 @@ object TransformerFunction { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -819,5 +850,8 @@ object TransformerFunction { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } diff --git a/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/ExpressionTest.scala b/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/ExpressionTest.scala index 060be11aa4f6..066dca4b78a1 100644 --- a/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/ExpressionTest.scala +++ b/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/ExpressionTest.scala @@ -117,6 +117,7 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5f807ff388 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -144,17 +145,25 @@ package org.locationtech.geomesa.convert2.transforms ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> c37a34dcb9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 2c3d834f45 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +<<<<<<< HEAD +>>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= <<<<<<< HEAD ======= ======= @@ -170,29 +179,41 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD >>>>>>> e5c8c292cc (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= <<<<<<< HEAD ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> e6452e3997 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 43856c6c78 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +<<<<<<< HEAD +>>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= <<<<<<< HEAD ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> 3e47057994 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -609,6 +630,11 @@ package org.locationtech.geomesa.convert2.transforms >>>>>>> dbc712b84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +<<<<<<< HEAD +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -617,6 +643,7 @@ package org.locationtech.geomesa.convert2.transforms >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> 6bd64e6308 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> e56fd38aa5 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2980,6 +3007,8 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD >>>>>>> cdb4102515 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD @@ -2988,6 +3017,7 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3038,6 +3068,8 @@ package org.locationtech.geomesa.convert2.transforms >>>>>>> c1f99f4bcb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -3063,6 +3095,7 @@ package org.locationtech.geomesa.convert2.transforms <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5559,12 +5592,20 @@ package org.locationtech.geomesa.convert2.transforms ======= >>>>>>> fd97977f9c (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c44517c361 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> aa65d3827d (GEOMESA-3109 Json array to object converter function (#2788)) @@ -5611,11 +5652,19 @@ package org.locationtech.geomesa.convert2.transforms >>>>>>> 76618c8da3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 354c37f8b4 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 35d929bd27 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -5634,11 +5683,16 @@ package org.locationtech.geomesa.convert2.transforms >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5654,10 +5708,15 @@ package org.locationtech.geomesa.convert2.transforms ======= ======= ======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -5676,10 +5735,16 @@ package org.locationtech.geomesa.convert2.transforms ======= >>>>>>> da0dbd0f47 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 35b3ecb03d (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> a539011150 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -6234,6 +6299,8 @@ package org.locationtech.geomesa.convert2.transforms >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> da0dbd0f47 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main import java.time.format.DateTimeFormatter import java.time.{LocalDateTime, ZoneOffset} import java.util.{Collections, Date} @@ -6241,6 +6308,7 @@ import java.util.{Collections, Date} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6285,6 +6353,8 @@ import java.util.{Collections, Date} <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -6406,6 +6476,7 @@ import java.util.{Collections, Date} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> fd97977f9c (GEOMESA-3109 Json array to object converter function (#2788)) @@ -7554,10 +7625,13 @@ import java.util.{Collections, Date} ======= >>>>>>> da0dbd0f47 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -10464,6 +10538,10 @@ import java.util.{Collections, Date} >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 60ee91581e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD @@ -10502,6 +10580,7 @@ import java.util.{Collections, Date} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 768fd6ea12 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -12209,6 +12288,11 @@ import java.util.{Collections, Date} >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> fd97977f9c (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -12238,6 +12322,7 @@ import java.util.{Collections, Date} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13986,6 +14071,10 @@ import java.util.{Collections, Date} >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -14014,6 +14103,7 @@ import java.util.{Collections, Date} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 947a867d1 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 748532d2db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -14158,6 +14248,12 @@ import java.util.{Collections, Date} >>>>>>> d4cf7f1e24 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -14170,6 +14266,7 @@ import java.util.{Collections, Date} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d5f1bdf64 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> c17c73531f (GEOMESA-3109 Json array to object converter function (#2788)) @@ -14390,12 +14487,25 @@ import java.util.{Collections, Date} >>>>>>> locationtech-main ======= ======= +>>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a38d1a4cc (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> e9b36da337 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -14495,12 +14605,16 @@ import java.util.{Collections, Date} ======= <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> locationtech-main >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> f302a54949 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -14511,6 +14625,8 @@ import java.util.{Collections, Date} ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -14520,6 +14636,7 @@ import java.util.{Collections, Date} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ad3cedc4d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9abc630fdf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15361,11 +15478,16 @@ import java.util.{Collections, Date} >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4f0e2712ab (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 768fd6ea12 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15384,10 +15506,15 @@ import java.util.{Collections, Date} >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 72bafaf54b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 7dfac253b4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15403,15 +15530,22 @@ import java.util.{Collections, Date} ======= ======= ======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9c337194ec (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 5d6a8a22c8 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -15421,18 +15555,22 @@ import java.util.{Collections, Date} <<<<<<< HEAD >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 91bbd30a52 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9e19addc31 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 35b3ecb03d (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> a539011150 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -16605,6 +16743,10 @@ import java.util.{Collections, Date} ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main import org.apache.commons.codec.binary.Base64 import org.geotools.util.Converters import org.junit.runner.RunWith @@ -16621,6 +16763,7 @@ import org.specs2.runner.JUnitRunner <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import java.nio.charset.StandardCharsets >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) @@ -16740,6 +16883,11 @@ import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 5057b7d518 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +import java.nio.charset.StandardCharsets +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main import java.time.format.DateTimeFormatter import java.time.{LocalDateTime, ZoneOffset} import java.util.{Collections, Date} @@ -16769,6 +16917,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(null) must be equalTo "hello" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -16888,6 +17037,11 @@ class ExpressionTest extends Specification { exp.eval(null) must be equalTo "hello" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(null) must be equalTo "hello" +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "allow quoted strings" >> { val exp = Expression("'he\\'llo'") @@ -16896,6 +17050,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(null) must be equalTo "he'llo" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -17015,6 +17170,11 @@ class ExpressionTest extends Specification { exp.eval(null) must be equalTo "he'llo" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(null) must be equalTo "he'llo" +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "allow empty literal strings" >> { val exp = Expression("''") @@ -17037,6 +17197,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17135,6 +17296,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(null) must be equalTo "" } "allow native ints" >> { @@ -17150,6 +17314,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17176,6 +17341,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main foreach(Seq(exp.apply(null), exp.eval(null))) { res => res must not(beNull) res.getClass mustEqual classOf[java.lang.Long] @@ -17184,6 +17351,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -17279,6 +17447,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "allow native floats" >> { val tests = Seq(("1.0", 1f), ("1.0", 1f), (".1", .1f), ("0.1", .1f), ("-1.0", -1f)) @@ -17293,6 +17464,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17354,6 +17526,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main foreach(Seq(exp.apply(null), exp.eval(null))) { res => res must not(beNull) res.getClass mustEqual classOf[java.lang.Float] @@ -17362,6 +17537,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -17453,6 +17629,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } } @@ -17469,6 +17648,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17530,6 +17710,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main foreach(Seq(exp.apply(null), exp.eval(null))) { res => res must not(beNull) res.getClass mustEqual classOf[java.lang.Double] @@ -17538,6 +17721,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -17629,6 +17813,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } } @@ -17676,6 +17863,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -18152,6 +18340,10 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +======= +>>>>>>> locationtech-main Expression("false").eval(null) mustEqual false Expression("true").eval(null) mustEqual true } @@ -18167,6 +18359,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -18207,6 +18400,8 @@ class ExpressionTest extends Specification { >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main exp.eval(Array("", "foo ", "bar")) must be equalTo "foo" exp.eval(Array("", null)) must beNull } @@ -18215,6 +18410,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD exp.apply(Array("", "foo", "bar")) must be equalTo "Foo" exp.apply(Array("", null)) must beNull @@ -18268,6 +18464,10 @@ class ExpressionTest extends Specification { exp.apply(Array("", "foo", "bar")) must be equalTo "Foo" exp.apply(Array("", null)) must beNull >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= + exp.apply(Array("", "foo", "bar")) must be equalTo "Foo" + exp.apply(Array("", null)) must beNull +>>>>>>> locationtech-main exp.eval(Array("", "foo", "bar")) must be equalTo "Foo" exp.eval(Array("", null)) must beNull } @@ -18276,6 +18476,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD exp.apply(Array("", "FOO", "bar")) must be equalTo "foo" exp.apply(Array("", null)) must beNull @@ -18329,6 +18530,10 @@ class ExpressionTest extends Specification { exp.apply(Array("", "FOO", "bar")) must be equalTo "foo" exp.apply(Array("", null)) must beNull >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= + exp.apply(Array("", "FOO", "bar")) must be equalTo "foo" + exp.apply(Array("", null)) must beNull +>>>>>>> locationtech-main exp.eval(Array("", "FOO", "bar")) must be equalTo "foo" exp.eval(Array("", null)) must beNull } @@ -18337,6 +18542,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD exp.apply(Array("", "FoO")) must be equalTo "FOO" exp.apply(Array("", null)) must beNull @@ -18390,6 +18596,10 @@ class ExpressionTest extends Specification { exp.apply(Array("", "FoO")) must be equalTo "FOO" exp.apply(Array("", null)) must beNull >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= + exp.apply(Array("", "FoO")) must be equalTo "FOO" + exp.apply(Array("", null)) must beNull +>>>>>>> locationtech-main exp.eval(Array("", "FoO")) must be equalTo "FOO" exp.eval(Array("", null)) must beNull } @@ -18398,6 +18608,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD exp.apply(Array("", "foobar")) must be equalTo "barbar" exp.apply(Array("", null)) must beNull @@ -18451,6 +18662,10 @@ class ExpressionTest extends Specification { exp.apply(Array("", "foobar")) must be equalTo "barbar" exp.apply(Array("", null)) must beNull >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= + exp.apply(Array("", "foobar")) must be equalTo "barbar" + exp.apply(Array("", null)) must beNull +>>>>>>> locationtech-main exp.eval(Array("", "foobar")) must be equalTo "barbar" exp.eval(Array("", null)) must beNull } @@ -18460,6 +18675,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -18474,6 +18690,8 @@ class ExpressionTest extends Specification { >>>>>>> location-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main exp.apply(Array("", " foobar ")) must be equalTo "barbar" exp.apply(Array("", null)) must beNull exp.eval(Array("", " foobar ")) must be equalTo "barbar" @@ -18481,6 +18699,7 @@ class ExpressionTest extends Specification { >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6d9a5b626 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> locationtech-main @@ -18899,6 +19118,8 @@ class ExpressionTest extends Specification { exp.eval(Array("", null)) must beNull >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main } "take substrings" >> { foreach(Seq("substring", "substr")) { fn => @@ -18917,6 +19138,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c83e8187d (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -19388,6 +19610,10 @@ class ExpressionTest extends Specification { >>>>>>> 74661c3147 (GEOMESA-3071 Move all converter state into evaluation context) exp.apply(Array("", "foobarbaz")) must be equalTo "foobarbaz".substring(2, 5) exp.apply(Array("", null)) must beNull +======= + exp.apply(Array("", "foobarbaz")) must be equalTo "foobarbaz".substring(2, 5) + exp.apply(Array("", null)) must beNull +>>>>>>> locationtech-main ======= ======= exp.apply(Array("", "foobarbaz")) must be equalTo "foobarbaz".substring(2, 5) @@ -19396,6 +19622,7 @@ class ExpressionTest extends Specification { exp.eval(Array("", "foobarbaz")) must be equalTo "foobarbaz".substring(2, 5) exp.eval(Array("", null)) must beNull >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> d9ed077cd1 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 810876750d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -19452,6 +19679,8 @@ class ExpressionTest extends Specification { exp.eval(Array("", null)) must beNull >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main } } "calculate strlen" >> { @@ -19470,6 +19699,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19822,6 +20052,8 @@ class ExpressionTest extends Specification { >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main exp.apply(Array("", "FOO")) mustEqual 3 exp.apply(Array("", null)) mustEqual 0 } @@ -19841,6 +20073,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -20305,11 +20538,16 @@ class ExpressionTest extends Specification { ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= exp.apply(Array("", "FOO")) mustEqual 3 exp.apply(Array("", null)) mustEqual 0 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main exp.eval(Array("", "FOO")) must be equalTo 3 exp.eval(Array("", null)) mustEqual 0 } @@ -20326,6 +20564,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -20686,6 +20925,10 @@ class ExpressionTest extends Specification { exp.apply(Array("", "FOO")) mustEqual 3 exp.apply(Array("", null)) mustEqual 0 >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= + exp.apply(Array("", "FOO")) mustEqual 3 + exp.apply(Array("", null)) mustEqual 0 +>>>>>>> locationtech-main exp.eval(Array("", "FOO")) must be equalTo 3 exp.eval(Array("", null)) mustEqual 0 } @@ -20702,6 +20945,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -20994,11 +21238,14 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main exp.apply(Array("", Int.box(5))) must be equalTo "5" exp.apply(Array("", null)) must beNull exp.eval(Array("", 5)) must be equalTo "5" exp.eval(Array("", null)) must beNull >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 12e3a588fc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -21067,6 +21314,8 @@ class ExpressionTest extends Specification { exp.eval(Array("", null)) must beNull >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main } "concat with toString" >> { val exp = Expression("concat(toString($1), toString($2))") @@ -21089,6 +21338,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -21339,6 +21589,10 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", 5, 6)) must be equalTo "56" } "concat many args" >> { @@ -21349,6 +21603,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -21388,6 +21643,8 @@ class ExpressionTest extends Specification { >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main exp.eval(Array("", 1, 2, 3, 4, 5, 6)) must be equalTo "123456" exp.eval(Array("", 1, null, 3, 4, 5, 6)) mustEqual "1null3456" } @@ -21397,6 +21654,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -21411,6 +21669,8 @@ class ExpressionTest extends Specification { >>>>>>> location-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main exp.apply(Array("", Int.box(1), Int.box(2), Int.box(3), Int.box(4), Int.box(5), Int.box(6))) must be equalTo "1,2,3,4,5,6" exp.apply(Array("", Int.box(1), null, Int.box(3), Int.box(4), Int.box(5), Int.box(6))) must be equalTo "1,null,3,4,5,6" exp.eval(Array("", 1, 2, 3, 4, 5, 6)) must be equalTo "1,2,3,4,5,6" @@ -21418,6 +21678,7 @@ class ExpressionTest extends Specification { >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6d9a5b626 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> locationtech-main @@ -21611,6 +21872,8 @@ class ExpressionTest extends Specification { exp.eval(Array("", 1, null, 3, 4, 5, 6)) must be equalTo "1,null,3,4,5,6" >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main } "convert emptyToNull" >> { val exp = Expression("emptyToNull($1)") @@ -21622,6 +21885,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -21683,6 +21947,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "foo")) mustEqual "foo" exp.eval(Array("", "")) must beNull exp.eval(Array("", " ")) must beNull @@ -21690,6 +21957,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -21781,6 +22049,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "printf" >> { val exp = Expression("printf('%s-%s-%sT00:00:00.000Z', '2015', '01', '01')") @@ -21789,6 +22060,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array()) mustEqual "2015-01-01T00:00:00.000Z" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -21908,6 +22180,11 @@ class ExpressionTest extends Specification { exp.eval(Array()) mustEqual "2015-01-01T00:00:00.000Z" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array()) mustEqual "2015-01-01T00:00:00.000Z" +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "handle non string ints" >> { val exp = Expression("$2") @@ -21916,6 +22193,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "1", 2)) must be equalTo 2 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -22035,6 +22313,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "1", 2)) must be equalTo 2 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "1", 2)) must be equalTo 2 +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "cast to int" >> { foreach(Seq("int", "integer")) { cast => @@ -22050,6 +22333,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -22111,6 +22395,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "1")) mustEqual 1 exp.eval(Array("", 1E2)) mustEqual 100 exp.eval(Array("", 1)) mustEqual 1 @@ -22121,6 +22408,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -22212,6 +22500,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } "cast to long" >> { @@ -22227,6 +22518,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -22288,6 +22580,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "1")) mustEqual 1L exp.eval(Array("", 1E2)) mustEqual 100L exp.eval(Array("", 1)) mustEqual 1L @@ -22298,6 +22593,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -22389,6 +22685,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "cast to float" >> { val exp = Expression("$1::float") @@ -22403,6 +22702,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -22464,6 +22764,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "1")) mustEqual 1F exp.eval(Array("", 1E2)) mustEqual 100F exp.eval(Array("", 1)) mustEqual 1F @@ -22474,6 +22777,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -22565,6 +22869,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "cast to double" >> { val exp = Expression("$1::double") @@ -22579,6 +22886,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -22640,6 +22948,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "1")) mustEqual 1D exp.eval(Array("", 1E2)) mustEqual 100D exp.eval(Array("", 1)) mustEqual 1D @@ -22650,6 +22961,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -22741,6 +23053,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "cast to boolean" >> { foreach(Seq("bool", "boolean")) { cast => @@ -22752,6 +23067,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -22904,12 +23220,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", "true")) mustEqual true exp.eval(Array("", "false")) mustEqual false exp.eval(Array("", null)) must throwA[NullPointerException] >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "cast to string" >> { @@ -22921,6 +23242,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -23073,12 +23395,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", "1")) mustEqual "1" exp.eval(Array("", 1)) mustEqual "1" exp.eval(Array("", null)) must throwA[NullPointerException] >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "parse dates with custom format" >> { val exp = Expression("date('yyyyMMdd', $1)") @@ -23087,6 +23414,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "20150101")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -23206,6 +23534,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "20150101")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "20150101")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse dates with a realistic custom format" >> { val exp = Expression("date('yyyy-MM-dd\\'T\\'HH:mm:ss.SSSSSS', $1)") @@ -23214,6 +23547,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "2015-01-01T00:00:00.000000")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -23333,6 +23667,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "2015-01-01T00:00:00.000000")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "2015-01-01T00:00:00.000000")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse datetime" >> { foreach(Seq("datetime", "dateTime")) { cast => @@ -23342,6 +23681,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "2015-01-01T00:00:00.000Z")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -23461,6 +23801,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "2015-01-01T00:00:00.000Z")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "2015-01-01T00:00:00.000Z")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } "parse isoDate" >> { @@ -23470,6 +23815,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "2015-01-01")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -23589,6 +23935,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "2015-01-01")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "2015-01-01")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse basicDate" >> { val exp = Expression("basicDate($1)") @@ -23597,6 +23948,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "20150101")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -23716,6 +24068,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "20150101")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "20150101")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse isoDateTime" >> { val exp = Expression("isoDateTime($1)") @@ -23724,6 +24081,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "2015-01-01T00:00:00")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -23843,6 +24201,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "2015-01-01T00:00:00")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "2015-01-01T00:00:00")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse basicDateTime" >> { val exp = Expression("basicDateTime($1)") @@ -23851,6 +24214,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "20150101T000000.000Z")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -23970,6 +24334,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "20150101T000000.000Z")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "20150101T000000.000Z")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse basicDateTimeNoMillis" >> { val exp = Expression("basicDateTimeNoMillis($1)") @@ -23978,6 +24347,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "20150101T000000Z")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -24097,6 +24467,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "20150101T000000Z")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "20150101T000000Z")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse dateHourMinuteSecondMillis" >> { val exp = Expression("dateHourMinuteSecondMillis($1)") @@ -24105,6 +24480,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "2015-01-01T00:00:00.000")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -24224,6 +24600,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "2015-01-01T00:00:00.000")).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "2015-01-01T00:00:00.000")).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse millisToDate" >> { val millis = Long.box(testDate.getTime) @@ -24233,6 +24614,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", millis)).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -24352,6 +24734,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", millis)).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", millis)).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse secsToDate" >> { val secs = Long.box(testDate.getTime / 1000L) @@ -24361,6 +24748,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", secs)).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -24480,6 +24868,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", secs)).asInstanceOf[Date] must be equalTo testDate >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", secs)).asInstanceOf[Date] must be equalTo testDate +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse null dates" >> { val input = Array("", null) @@ -24502,13 +24895,17 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= Expression(expression).eval(input.asInstanceOf[Array[Any]]) must beNull Expression(s"require($expression)").eval(input.asInstanceOf[Array[Any]]) must throwAn[IllegalArgumentException] >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -24627,6 +25024,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "transform a date to a string" >> { @@ -24638,6 +25037,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", Date.from(d.toInstant(ZoneOffset.UTC)))).asInstanceOf[String] must be equalTo fmt.format(d) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -24757,6 +25157,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", Date.from(d.toInstant(ZoneOffset.UTC)))).asInstanceOf[String] must be equalTo fmt.format(d) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", Date.from(d.toInstant(ZoneOffset.UTC)))).asInstanceOf[String] must be equalTo fmt.format(d) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "transform a date to milliseconds" >> { val d = new Date(9999000) @@ -24766,6 +25171,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", d)) mustEqual d.getTime >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -24885,6 +25291,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", d)) mustEqual d.getTime >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", d)) mustEqual d.getTime +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse date strings from printf" >> { val exp = Expression("datetime(printf('%s-%s-%sT00:00:00.000Z', $1, $2, $3))") @@ -24915,6 +25326,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "2015", "01", "01")) must be equalTo testDate ======= @@ -33503,6 +33915,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", "2015", "01", "01")) must be equalTo testDate } @@ -33511,6 +33925,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD exp.apply(Array("", Double.box(45.0), Double.box(45.0))).asInstanceOf[Point].getCoordinate mustEqual new Coordinate(45.0, 45.0) exp.eval(Array("", 45.0, 45.0)).asInstanceOf[Point].getCoordinate must be equalTo new Coordinate(45.0, 45.0) @@ -33763,6 +34178,8 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -33795,12 +34212,16 @@ class ExpressionTest extends Specification { ======= <<<<<<< HEAD >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -33809,6 +34230,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -33841,29 +34263,43 @@ class ExpressionTest extends Specification { >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) ======= +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) @@ -34675,24 +35111,32 @@ class ExpressionTest extends Specification { ======= >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) ======= +======= +>>>>>>> locationtech-main >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 849693a129 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5ee6153cc5 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -34704,13 +35148,17 @@ class ExpressionTest extends Specification { ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 54cfc0cf1a (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8170c2c54a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -34725,9 +35173,16 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 81b8eb5aeb (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -38121,11 +38576,16 @@ class ExpressionTest extends Specification { exp.eval(Array("", 45.0, 46.0)) mustEqual WKTUtils.read("POINT(45 46)") >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') exp.apply(Array("", Double.box(45.0), Double.box(46.0))) mustEqual WKTUtils.read("POINT(45 46)") exp.eval(Array("", 45.0, 46.0)) mustEqual WKTUtils.read("POINT(45 46)") +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main val trans = Expression("point($0)") @@ -38135,6 +38595,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 41b057b6f8 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -38205,6 +38666,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 86ce2affbb (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main val z = Expression("point($1,$2,$3)") z.apply(Array("", Double.box(45.0), Double.box(46.0), Double.box(47))).asInstanceOf[Point] .getCoordinate.toString mustEqual new Coordinate(45.0, 46.0, 47).toString @@ -38223,6 +38686,7 @@ class ExpressionTest extends Specification { m.eval(Array("", 45.0, 46.0, 47.0)).asInstanceOf[Point] .getCoordinate.toString mustEqual new CoordinateXYM(45.0, 46.0, 47).toString <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -38283,6 +38747,8 @@ class ExpressionTest extends Specification { <<<<<<< HEAD ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ======= exp.apply(Array("", Double.box(45.0), Double.box(45.0))).asInstanceOf[Point].getCoordinate mustEqual new Coordinate(45.0, 45.0) exp.eval(Array("", 45.0, 45.0)).asInstanceOf[Point].getCoordinate must be equalTo new Coordinate(45.0, 45.0) @@ -38338,8 +38804,11 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +======= +>>>>>>> locationtech-main >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) val trans = Expression("point($0)") @@ -38433,6 +38902,9 @@ class ExpressionTest extends Specification { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -38452,6 +38924,7 @@ class ExpressionTest extends Specification { >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -38473,6 +38946,8 @@ class ExpressionTest extends Specification { >>>>>>> d8537eee3b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main // turn "Geometry" into "Point" val geoFac = new GeometryFactory() val geom = geoFac.createPoint(new Coordinate(55, 56)).asInstanceOf[Geometry] @@ -38496,6 +38971,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> eb23a24e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -38505,6 +38981,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -38524,10 +39002,13 @@ class ExpressionTest extends Specification { >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= >>>>>>> eb23a24e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main val z = Expression("point($1,$2,$3)") z.apply(Array("", Double.box(45.0), Double.box(46.0), Double.box(47))).asInstanceOf[Point] .getCoordinate.toString mustEqual new Coordinate(45.0, 46.0, 47).toString @@ -38554,6 +39035,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> locationtech-main @@ -39206,6 +39688,12 @@ class ExpressionTest extends Specification { ======= <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main ======= exp.apply(Array("", Double.box(45.0), Double.box(45.0))).asInstanceOf[Point].getCoordinate mustEqual new Coordinate(45.0, 45.0) exp.eval(Array("", 45.0, 45.0)).asInstanceOf[Point].getCoordinate must be equalTo new Coordinate(45.0, 45.0) @@ -39294,6 +39782,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main @@ -39320,6 +39809,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -39328,6 +39819,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -40106,20 +40598,28 @@ class ExpressionTest extends Specification { ======= <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 849693a12 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5ee6153cc (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +======= +>>>>>>> locationtech-main >>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) @@ -40127,6 +40627,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -40138,10 +40639,13 @@ class ExpressionTest extends Specification { ======= >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ae5490a34 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD ======= @@ -40744,6 +41248,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main val z = Expression("point($1,$2,$3)") z.apply(Array("", Double.box(45.0), Double.box(46.0), Double.box(47))).asInstanceOf[Point] .getCoordinate.toString mustEqual new Coordinate(45.0, 46.0, 47).toString @@ -40767,6 +41273,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -40852,6 +41359,10 @@ class ExpressionTest extends Specification { ======= <<<<<<< HEAD >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD ======= @@ -40859,6 +41370,7 @@ class ExpressionTest extends Specification { ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= <<<<<<< HEAD @@ -40868,12 +41380,15 @@ class ExpressionTest extends Specification { ======= >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f7f519540 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 4bf896fb5b (GEOMESA-3071 Move all converter state into evaluation context) @@ -40946,10 +41461,13 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -40981,11 +41499,16 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= ======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 849693a12 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> ade675c0aa (GEOMESA-3071 Move all converter state into evaluation context) @@ -41014,6 +41537,8 @@ class ExpressionTest extends Specification { >>>>>>> 5ee6153cc5 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -41021,6 +41546,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -41081,11 +41607,15 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= <<<<<<< HEAD @@ -41101,32 +41631,41 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a7ca1d57e6 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> adc6646ece (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d1cf3ad8b5 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 13d53e6b02 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9e8a3c11c3 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 8a671ae630 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -41150,21 +41689,31 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 2f79835b1b (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e762caca54 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> ff17a571bc (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -42726,6 +43275,10 @@ class ExpressionTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } "parse multipoint wkt and objects" >> { val geoFac = new GeometryFactory() @@ -42746,6 +43299,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -42813,6 +43367,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("Multipoint((45.0 45.0), (50 52))")).asInstanceOf[MultiPoint] mustEqual multiPoint // convert objects @@ -42874,6 +43431,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -44140,6 +44698,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse multipoint from x/y coords" >> { val expected = WKTUtils.read("MultiPoint((45.0 45.0), (50 52))") @@ -44154,6 +44715,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -46138,6 +46700,11 @@ class ExpressionTest extends Specification { <<<<<<< HEAD >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 2235f120d4 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +<<<<<<< HEAD +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse multipoint from x/y coords" >> { val expected = WKTUtils.read("MultiPoint((45.0 45.0), (50 52))") @@ -46296,6 +46863,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -46363,6 +46931,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("Linestring(102 0, 103 1, 104 0, 105 1)")).asInstanceOf[LineString] mustEqual lineStr // type conversion @@ -46424,6 +46995,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -47690,6 +48262,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse linestring from x/y coords" >> { val expected = WKTUtils.read("Linestring(102 0, 103 1, 104 0, 105 1)") @@ -47704,6 +48279,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -49688,6 +50264,11 @@ class ExpressionTest extends Specification { <<<<<<< HEAD >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 2235f120d4 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +<<<<<<< HEAD +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse linestring from x/y coords" >> { val expected = WKTUtils.read("Linestring(102 0, 103 1, 104 0, 105 1)") @@ -49846,6 +50427,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -49902,6 +50484,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("MultiLinestring((102 0, 103 1, 104 0, 105 1), (0 0, 1 2, 2 3, 4 5))")).asInstanceOf[MultiLineString] mustEqual multiLineStr // type conversion @@ -49914,6 +50499,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -50012,6 +50598,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse polygon wkt and objects" >> { val geoFac = new GeometryFactory() @@ -50029,6 +50618,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -50085,6 +50675,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("polygon((100 0, 101 0, 101 1, 100 1, 100 0))")).asInstanceOf[Polygon] mustEqual poly // type conversion @@ -50097,6 +50690,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -50195,6 +50789,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse multipolygon wkt and objects" >> { val geoFac = new GeometryFactory() @@ -50215,6 +50812,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -50271,6 +50869,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("multipolygon(((100 0, 101 0, 101 1, 100 1, 100 0)), ((10 0, 11 0, 11 1, 10 1, 10 0)))")).asInstanceOf[MultiPolygon] mustEqual multiPoly // type conversion @@ -50283,6 +50884,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -50381,6 +50983,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse geometry wkt and objects" >> { val geoFac = new GeometryFactory() @@ -50398,6 +51003,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -50454,6 +51060,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("Linestring(102 0, 103 1, 104 0, 105 1)")).asInstanceOf[Geometry] must be equalTo lineStr // type conversion @@ -50466,6 +51075,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -50564,6 +51174,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse geometrycollection wkt and objects" >> { val geoFac = new GeometryFactory() @@ -50594,6 +51207,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -50661,6 +51275,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("GeometryCollection(Linestring(102 0, 103 1, 104 0, 105 1)," + "multipolygon(((100 0, 101 0, 101 1, 100 1, 100 0)), " + "((10 0, 11 0, 11 1, 10 1, 10 0))))")).asInstanceOf[GeometryCollection] mustEqual geoCol @@ -50706,6 +51323,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fa3a402d4 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -51191,6 +51809,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD ======= ======= @@ -51214,6 +51834,7 @@ class ExpressionTest extends Specification { foreach(functions.map(Expression.apply)) { exp => exp.apply(Array(null, null)) must beNull exp.eval(Array(null, null)) must beNull +<<<<<<< HEAD } <<<<<<< HEAD ======= @@ -52921,7 +53542,157 @@ class ExpressionTest extends Specification { >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } +<<<<<<< HEAD +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null geometries" >> { + val functions = + Seq( + "point($0)", + "point($0, $1)", + "linestring($0)", + "multipoint($0)", + "polygon($0)", + "multilinestring($0)", + "multipolygon($0)", + "geometrycollection($0)", + "geometry($0)" + ) + foreach(functions.map(Expression.apply)) { exp => + exp.apply(Array(null, null)) must beNull + exp.eval(Array(null, null)) must beNull + } +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null geometries" >> { + val functions = + Seq( + "point($0)", + "point($0, $1)", + "linestring($0)", + "multipoint($0)", + "polygon($0)", + "multilinestring($0)", + "multipolygon($0)", + "geometrycollection($0)", + "geometry($0)" + ) + foreach(functions.map(Expression.apply)) { exp => + exp.apply(Array(null, null)) must beNull + exp.eval(Array(null, null)) must beNull + } +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null geometries" >> { + val functions = + Seq( + "point($0)", + "point($0, $1)", + "linestring($0)", + "multipoint($0)", + "polygon($0)", + "multilinestring($0)", + "multipolygon($0)", + "geometrycollection($0)", + "geometry($0)" + ) + foreach(functions.map(Expression.apply)) { exp => + exp.apply(Array(null, null)) must beNull + exp.eval(Array(null, null)) must beNull + } +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null geometries" >> { + val functions = + Seq( + "point($0)", + "point($0, $1)", + "linestring($0)", + "multipoint($0)", + "polygon($0)", + "multilinestring($0)", + "multipolygon($0)", + "geometrycollection($0)", + "geometry($0)" + ) +<<<<<<< HEAD +<<<<<<< HEAD + foreach(functions.map(Expression.apply)) { exp => + exp.apply(Array(null, null)) must beNull +======= + foreach(functions) { exp => + Expression(exp).eval(Array(null, null)) must beNull +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= + foreach(functions.map(Expression.apply)) { exp => + exp.apply(Array(null, null)) must beNull + exp.eval(Array(null, null)) must beNull +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) + } + } + "parse null geometries" >> { + val functions = + Seq( + "point($0)", + "point($0, $1)", + "linestring($0)", + "multipoint($0)", + "polygon($0)", + "multilinestring($0)", + "multipolygon($0)", + "geometrycollection($0)", + "geometry($0)" + ) + foreach(functions) { exp => + Expression(exp).eval(Array(null, null)) must beNull + } + } + "parse null geometries" >> { + val functions = + Seq( + "point($0)", + "point($0, $1)", + "linestring($0)", + "multipoint($0)", + "polygon($0)", + "multilinestring($0)", + "multipolygon($0)", + "geometrycollection($0)", + "geometry($0)" + ) + foreach(functions) { exp => + Expression(exp).eval(Array(null, null)) must beNull + } + } + "parse null geometries" >> { + val functions = + Seq( + "point($0)", + "point($0, $1)", + "linestring($0)", + "multipoint($0)", + "polygon($0)", + "multilinestring($0)", + "multipolygon($0)", + "geometrycollection($0)", + "geometry($0)" + ) + foreach(functions) { exp => + Expression(exp).eval(Array(null, null)) must beNull + } +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') } ======= >>>>>>> 1ba2f23b3d (GEOMESA-3071 Move all converter state into evaluation context) @@ -57481,6 +58252,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -57529,6 +58301,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main ======= val hashedResult = exp.eval(Array(testBytes)).asInstanceOf[String] hashedResult mustEqual "53587708703184a0b6f8952425c21d9f" @@ -57536,6 +58310,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -57570,6 +58345,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main } "generate uuids" >> { val exp = Expression("uuid()") @@ -57582,6 +58359,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -63237,6 +64015,8 @@ class ExpressionTest extends Specification { >>>>>>> 397a13ab3c (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= foreach(Seq(trans.apply(Array("", geom)), trans.eval(Array("", geom)))) { transformed => transformed must not(beNull) @@ -63248,6 +64028,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 58d14a257e (GEOMESA-3254 Add Bloop build support) >>>>>>> 7564665969 (GEOMESA-3254 Add Bloop build support) @@ -68481,6 +69262,8 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main } "generate md5 hashes" >> { val exp = Expression("md5($0)") @@ -69042,7 +69825,10 @@ class ExpressionTest extends Specification { } "generate uuids" >> { val exp = Expression("uuid()") +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main foreach(Seq(exp.apply(null), exp.eval(null))) { res => res must not(beNull) res.getClass mustEqual classOf[String] @@ -69050,6 +69836,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -69196,6 +69983,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "generate z3 uuids" >> { val exp = Expression("uuidZ3($0, $1, 'week')") @@ -69208,6 +69998,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -69269,6 +70060,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main foreach(Seq(exp.apply(Array(geom, date)), exp.eval(Array(geom, date)))) { res => res must not(beNull) res.getClass mustEqual classOf[String] @@ -69276,6 +70070,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -69367,6 +70162,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "generate z3 centroid uuids" >> { val exp = Expression("uuidZ3Centroid($0, $1, 'week')") @@ -69394,6 +70192,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -69461,6 +70260,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main foreach(Seq(exp.apply(Array(geom, date)), exp.eval(Array(geom, date)))) { res => res must not(beNull) res.getClass mustEqual classOf[String] @@ -69470,6 +70272,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 58d14a257 (GEOMESA-3254 Add Bloop build support) ======= @@ -69520,6 +70323,8 @@ class ExpressionTest extends Specification { >>>>>>> 58d14a257 (GEOMESA-3254 Add Bloop build support) >>>>>>> fa60953a42 (GEOMESA-3254 Add Bloop build support) >>>>>>> e74fa3f690 (GEOMESA-3254 Add Bloop build support) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main } "encode bytes as base64 strings" >> { @@ -69623,6 +70428,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -73683,6 +74489,8 @@ class ExpressionTest extends Specification { >>>>>>> da0dbd0f47 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main val exp = Expression("base64($0)") exp.apply(Array(testBytes)) must be equalTo Base64.encodeBase64URLSafeString(testBytes) exp.eval(Array(testBytes)) must be equalTo Base64.encodeBase64URLSafeString(testBytes) @@ -73698,6 +74506,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> baa52efeb2 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -73992,11 +74801,15 @@ class ExpressionTest extends Specification { ======= >>>>>>> a8155d31a1 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +======= +======= +>>>>>>> locationtech-main >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -74038,6 +74851,11 @@ class ExpressionTest extends Specification { >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 7a0ab99f8 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -74051,6 +74869,7 @@ class ExpressionTest extends Specification { >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d1cf3ad8b (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -74059,6 +74878,10 @@ class ExpressionTest extends Specification { >>>>>>> 7a0ab99f8 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -74066,6 +74889,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c399a7eef (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -74089,6 +74913,8 @@ class ExpressionTest extends Specification { >>>>>>> 7a0ab99f8 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 541f1862a7 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -74097,6 +74923,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -74123,6 +74950,11 @@ class ExpressionTest extends Specification { >>>>>>> e08000604 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -74133,6 +74965,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -74166,6 +74999,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> d1cf3ad8b (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -74175,6 +75010,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -74198,6 +75034,10 @@ class ExpressionTest extends Specification { ======= >>>>>>> 35b3ecb03 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 7b395bc2b7 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) @@ -74208,6 +75048,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03967b3f4 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -74222,6 +75063,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> 35b3ecb03 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 7b395bc2b7 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -74231,6 +75074,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -74252,6 +75096,11 @@ class ExpressionTest extends Specification { ======= >>>>>>> 35b3ecb03 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +>>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> locationtech-main >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -74260,6 +75109,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -74316,6 +75166,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> e49f1355d3 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) @@ -74328,6 +75180,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> location-main @@ -74361,6 +75214,14 @@ class ExpressionTest extends Specification { ======= >>>>>>> locationtech-main ======= +>>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -74368,6 +75229,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -74382,6 +75244,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -74392,6 +75256,7 @@ class ExpressionTest extends Specification { >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -74419,12 +75284,17 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2ac294bf (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -74445,6 +75315,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -74454,6 +75326,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -75329,10 +76202,13 @@ class ExpressionTest extends Specification { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -75448,6 +76324,8 @@ class ExpressionTest extends Specification { >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 12b63c14c2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main foreach(Seq("base64($0)", "base64Encode($0)")) { expression => val exp = Expression(expression) exp.apply(Array(testBytes)) mustEqual Base64.encodeBase64URLSafeString(testBytes) @@ -75455,6 +76333,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ea9667862 (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD @@ -75472,6 +76351,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 5057b7d518 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main } } "decode base64 strings as bytes" >> { @@ -75483,6 +76364,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -78855,6 +79737,8 @@ class ExpressionTest extends Specification { <<<<<<< HEAD >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main exp.eval(Array(encoded)) mustEqual testBytes <<<<<<< HEAD @@ -78881,6 +79765,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ea9667862 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 7705eeb678 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -83690,6 +84575,8 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -83794,6 +84681,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eccc16ddf (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> ccaae60e3f (GEOMESA-3071 Move all converter state into evaluation context) @@ -83813,10 +84701,15 @@ class ExpressionTest extends Specification { >>>>>>> 6938112d5 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 063b0f26f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 6d26127ad6 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -83831,10 +84724,13 @@ class ExpressionTest extends Specification { ======= >>>>>>> 6938112d5 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 71edb3b56 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 2a5fd16e2a (GEOMESA-3071 Move all converter state into evaluation context) @@ -83854,11 +84750,16 @@ class ExpressionTest extends Specification { >>>>>>> c0dc422e2 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d5f1bdf64 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> c17c73531f (GEOMESA-3109 Json array to object converter function (#2788)) @@ -83875,6 +84776,8 @@ class ExpressionTest extends Specification { ======= >>>>>>> 54cfc0cf1 (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -83890,6 +84793,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f7f519540 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 4bf896fb5b (GEOMESA-3071 Move all converter state into evaluation context) @@ -83902,6 +84806,8 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -83914,6 +84820,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1bc88f7e2 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 941c4a6320 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -83941,9 +84848,14 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a38d1a4cc (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> e9b36da337 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -83956,12 +84868,15 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 849693a12 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> ade675c0aa (GEOMESA-3071 Move all converter state into evaluation context) @@ -84017,10 +84932,19 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 54cfc0cf1 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> b0af051989 (GEOMESA-3071 Move all converter state into evaluation context) @@ -84033,10 +84957,13 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6938112d5 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 1b600f3f7a (GEOMESA-3109 Json array to object converter function (#2788)) @@ -84064,9 +84991,14 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cd8248bbd (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> e29e638726 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -84079,12 +85011,15 @@ class ExpressionTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 81b8eb5ae (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 55324ccde8 (GEOMESA-3071 Move all converter state into evaluation context) @@ -84758,6 +85693,12 @@ class ExpressionTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } "handle whitespace in functions" >> { val variants = Seq( @@ -84771,6 +85712,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("", "2015", "01", "01")) mustEqual "2015-01-01T00:00:00.000Z" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -84890,6 +85832,11 @@ class ExpressionTest extends Specification { exp.eval(Array("", "2015", "01", "01")) mustEqual "2015-01-01T00:00:00.000Z" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("", "2015", "01", "01")) mustEqual "2015-01-01T00:00:00.000Z" +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } "handle named values" >> { @@ -84908,6 +85855,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -84969,6 +85917,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main // deprecated api ctx.set(1, "bar") @@ -84976,6 +85927,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -85067,6 +86019,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "handle named values with spaces and dots" >> { val fields = Seq( @@ -85085,6 +86040,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -85146,6 +86102,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main // deprecated api ctx.clear() @@ -85156,6 +86115,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -85247,6 +86207,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "handle exceptions to casting" >> { val exp = Expression("try($1::int, 0)") @@ -85257,6 +86220,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -85409,12 +86373,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", "1")).asInstanceOf[Int] mustEqual 1 exp.eval(Array("", "")).asInstanceOf[Int] mustEqual 0 exp.eval(Array("", "abcd")).asInstanceOf[Int] mustEqual 0 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "handle exceptions to millisecond conversions" >> { val exp = Expression("try(millisToDate($1), now())") @@ -85426,6 +86395,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -85578,12 +86548,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", millis)).asInstanceOf[Date] mustEqual new Date(millis) exp.eval(Array("", "")).asInstanceOf[Date].getTime must beCloseTo(System.currentTimeMillis(), 100) exp.eval(Array("", "abcd")).asInstanceOf[Date].getTime must beCloseTo(System.currentTimeMillis(), 100) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "handle exceptions to millisecond conversions with null defaults" >> { val exp = Expression("try(millisToDate($1), null)") @@ -85595,6 +86570,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -85747,12 +86723,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", millis)).asInstanceOf[Date] mustEqual new Date(millis) exp.eval(Array("", "")).asInstanceOf[Date] must beNull exp.eval(Array("", "abcd")).asInstanceOf[Date] must beNull >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "handle exceptions to second conversions" >> { val exp = Expression("try(secsToDate($1), now())") @@ -85764,6 +86745,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -85916,12 +86898,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", secs)).asInstanceOf[Date] mustEqual new Date(secs*1000L) exp.eval(Array("", "")).asInstanceOf[Date].getTime must beCloseTo(System.currentTimeMillis(), 1000) exp.eval(Array("", "abcd")).asInstanceOf[Date].getTime must beCloseTo(System.currentTimeMillis(), 100) >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "handle exceptions to second conversions with null defaults" >> { val exp = Expression("try(secsToDate($1), null)") @@ -85933,6 +86920,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -86085,12 +87073,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", secs)).asInstanceOf[Date] mustEqual new Date(secs*1000L) exp.eval(Array("", "")).asInstanceOf[Date] must beNull exp.eval(Array("", "abcd")).asInstanceOf[Date] must beNull >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "allow spaces in try statements" >> { foreach(Seq("try($1::int,0)", "try ( $1::int, 0 )")) { t => @@ -86102,6 +87095,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -86254,12 +87248,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= exp.eval(Array("", "1")).asInstanceOf[Int] mustEqual 1 exp.eval(Array("", "")).asInstanceOf[Int] mustEqual 0 exp.eval(Array("", "abcd")).asInstanceOf[Int] mustEqual 0 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "add" >> { @@ -86270,13 +87269,17 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp1.eval(Array("","1","2")) mustEqual 3.0 exp1.eval(Array("","-1","2")) mustEqual 1.0 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -86395,6 +87398,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main val exp2 = Expression("add($1,$2,$3)") exp2.apply(Array("","1","2","3.0")) mustEqual 6.0 @@ -86410,6 +87415,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -86475,6 +87481,8 @@ class ExpressionTest extends Specification { >>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp2.eval(Array("","1","2","3.0")) mustEqual 6.0 exp2.eval(Array("","-1","2","3.0")) mustEqual 4.0 @@ -86485,6 +87493,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -86675,6 +87684,8 @@ class ExpressionTest extends Specification { exp.eval(Array(Seq("2","3").asJava)) mustEqual 5.0 ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "add a list" >> { val exp = Expression("add($0)") @@ -86689,13 +87700,17 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp1.eval(Array("","1","2")) mustEqual 2.0 exp1.eval(Array("","-1","2")) mustEqual -2.0 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -86814,6 +87829,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main val exp2 = Expression("multiply($1,$2,$3)") exp2.apply(Array("","1","2","3.0")) mustEqual 6.0 @@ -86829,6 +87846,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -86894,6 +87912,8 @@ class ExpressionTest extends Specification { >>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp2.eval(Array("","1","2","3.0")) mustEqual 6.0 exp2.eval(Array("","-1","2","3.0")) mustEqual -6.0 @@ -86904,6 +87924,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -87094,6 +88115,8 @@ class ExpressionTest extends Specification { exp.eval(Array(Seq("2","3").asJava)) mustEqual 6.0 ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "multiply a list" >> { val exp = Expression("multiply($0)") @@ -87108,13 +88131,17 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp1.eval(Array("","2","1")) mustEqual 1.0 exp1.eval(Array("","-1","2")) mustEqual -3.0 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -87233,6 +88260,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main val exp2 = Expression("subtract($1,$2,$3)") exp2.apply(Array("","1","2","3.0")) mustEqual -4.0 @@ -87248,6 +88277,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -87313,6 +88343,8 @@ class ExpressionTest extends Specification { >>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp2.eval(Array("","1","2","3.0")) mustEqual -4.0 exp2.eval(Array("","-1","2","3.0")) mustEqual -6.0 @@ -87323,6 +88355,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -87513,6 +88546,8 @@ class ExpressionTest extends Specification { exp.eval(Array(Seq("2","1").asJava)) mustEqual 1.0 ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "subtract a list" >> { val exp = Expression("subtract($0)") @@ -87527,13 +88562,17 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp1.eval(Array("","2","1")) mustEqual 2.0 exp1.eval(Array("","-1","2")) mustEqual -0.5 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -87652,6 +88691,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main val exp2 = Expression("divide($1,$2,$3)") exp2.apply(Array("","1","2","3.0")) mustEqual (1.0/2/3) // 0.166666666666 @@ -87667,6 +88708,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -87732,6 +88774,8 @@ class ExpressionTest extends Specification { >>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp2.eval(Array("","1","2","3.0")) mustEqual (1.0/2/3) // 0.166666666666 exp2.eval(Array("","-1","2","3.0")) mustEqual (-1.0/2/3) // -0.166666666666 @@ -87742,6 +88786,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -87932,6 +88977,8 @@ class ExpressionTest extends Specification { exp.eval(Array(Seq("2","1").asJava)) mustEqual 2.0 ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "divide a list" >> { val exp = Expression("divide($0)") @@ -87952,6 +88999,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -88202,6 +89250,11 @@ class ExpressionTest extends Specification { exp1.eval(Array("","1","2","3","4")) mustEqual 2.5 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp1.eval(Array("","1","2","3","4")) mustEqual 2.5 +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "find mean of list" >> { val exp1 = Expression("mean($0)") @@ -88226,6 +89279,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -88542,6 +89596,11 @@ class ExpressionTest extends Specification { exp1.eval(Array("","1","2","3","4")) mustEqual 1 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp1.eval(Array("","1","2","3","4")) mustEqual 1 +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "find min of list" >> { val exp1 = Expression("min($0)::int") @@ -88571,6 +89630,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -88887,6 +89947,11 @@ class ExpressionTest extends Specification { exp1.eval(Array("","1","2","3","4")) mustEqual 4 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp1.eval(Array("","1","2","3","4")) mustEqual 4 +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "find max of list" >> { val exp1 = Expression("max($0)::int") @@ -88905,6 +89970,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= exp.eval(Array("","-1","2","3.0")) mustEqual "-0.17" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -89024,6 +90090,11 @@ class ExpressionTest extends Specification { exp.eval(Array("","-1","2","3.0")) mustEqual "-0.17" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + exp.eval(Array("","-1","2","3.0")) mustEqual "-0.17" +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "allow for number formatting using printf" >> { val exp = Expression("printf('%.2f', divide(-1, 2, 3))") @@ -89042,6 +90113,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -89098,6 +90170,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array()) mustEqual "-0.17" } "support cql buffer" >> { @@ -89113,6 +90188,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -89214,6 +90290,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "pass literals through to cql functions" >> { val exp = Expression("cql:intersects(geometry('POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))'), $1)") @@ -89225,13 +90304,17 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= exp.eval(Array(null, "POINT(27.8 31.1)")) mustEqual true exp.eval(Array(null, "POINT(1 1)")) mustEqual false >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -89350,6 +90433,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "convert stringToDouble zero default" >> { val exp = Expression("stringToDouble($1, 0.0)") @@ -89361,6 +90446,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -89422,6 +90508,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "1.2")) mustEqual 1.2 exp.eval(Array("", "")) mustEqual 0.0 exp.eval(Array("", null)) mustEqual 0.0 @@ -89429,6 +90518,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -89520,6 +90610,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "convert stringToDouble null default" >> { val exp = Expression("stringToDouble($1, $2)") @@ -89531,6 +90624,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -89592,6 +90686,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "1.2", null)) mustEqual 1.2 exp.eval(Array("", "", null)) mustEqual null exp.eval(Array("", null, null)) mustEqual null @@ -89599,6 +90696,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -89690,6 +90788,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "convert stringToInt zero default" >> { foreach(Seq("stringToInt", "stringToInteger")) { fn => @@ -89702,6 +90803,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -89763,6 +90865,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "2")) mustEqual 2 exp.eval(Array("", "")) mustEqual 0 exp.eval(Array("", null)) mustEqual 0 @@ -89770,6 +90875,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -89861,6 +90967,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } "convert stringToInt null default" >> { @@ -89874,6 +90983,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -89935,6 +91045,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "2", null)) mustEqual 2 exp.eval(Array("", "", null)) mustEqual null exp.eval(Array("", null, null)) mustEqual null @@ -89942,6 +91055,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -90033,6 +91147,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } "convert stringToLong zero default" >> { @@ -90045,6 +91162,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -90106,6 +91224,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "22960000000")) mustEqual 22960000000L exp.eval(Array("", "")) mustEqual 0L exp.eval(Array("", null)) mustEqual 0L @@ -90113,6 +91234,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -90204,6 +91326,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "convert stringToLong null default" >> { val exp = Expression("stringToLong($1, $2)") @@ -90215,6 +91340,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -90276,6 +91402,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "22960000000", null)) mustEqual 22960000000L exp.eval(Array("", "", null)) mustEqual null exp.eval(Array("", null, null)) mustEqual null @@ -90283,6 +91412,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -90374,6 +91504,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "convert stringToFloat zero default" >> { val exp = Expression("stringToFloat($1, 0.0f)") @@ -90385,6 +91518,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -90446,6 +91580,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "1.2")) mustEqual 1.2f exp.eval(Array("", "")) mustEqual 0.0f exp.eval(Array("", null)) mustEqual 0.0f @@ -90453,6 +91590,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -90544,6 +91682,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "convert stringToFloat zero default" >> { val exp = Expression("stringToFloat($1, $2)") @@ -90555,6 +91696,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -90616,6 +91758,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "1.2", null)) mustEqual 1.2f exp.eval(Array("", "", null)) mustEqual null exp.eval(Array("", null, null)) mustEqual null @@ -90623,6 +91768,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -90714,6 +91860,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "convert stringToBoolean false default" >> { val exp = Expression("stringToBoolean($1, false)") @@ -90725,6 +91874,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -90786,6 +91936,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "true")) mustEqual true exp.eval(Array("", "")) mustEqual false exp.eval(Array("", null)) mustEqual false @@ -90793,6 +91946,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -90884,6 +92038,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "convert stringToBoolean null default" >> { val exp = Expression("stringToBoolean($1,$2)") @@ -90895,6 +92052,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -90956,6 +92114,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main exp.eval(Array("", "true", null)) mustEqual true exp.eval(Array("", "", null)) mustEqual null exp.eval(Array("", null, null)) mustEqual null @@ -90963,6 +92124,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -91054,6 +92216,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "return null for non-existing fields" >> { val fields = Seq( @@ -91112,6 +92277,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -91179,6 +92345,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main // old api ctx.set(0, "5") @@ -91186,6 +92355,46 @@ class ExpressionTest extends Specification { Expression("$b").eval(Array())(ctx) mustEqual null Expression("$bar").eval(Array())(ctx) mustEqual "10" <<<<<<< HEAD +======= + } + "create lists" >> { + val trans = Expression("list($0, $1, $2)") + foreach(Seq(trans.apply(Array("a", "b", "c")), trans.eval(Array("a", "b", "c")))) { res => + res must not(beNull) + res.asInstanceOf[AnyRef] must beAnInstanceOf[java.util.List[String]] + res.asInstanceOf[java.util.List[String]].size() mustEqual 3 + res.asInstanceOf[java.util.List[String]].asScala mustEqual List("a", "b", "c") + } + } + "parse lists with default delimiter" >> { + val trans = Expression("parseList('string', $0)") + foreach(Seq(trans.apply(Array("a,b,c")), trans.eval(Array("a,b,c")))) { res => + res must not(beNull) + res.asInstanceOf[AnyRef] must beAnInstanceOf[java.util.List[String]] + res.asInstanceOf[java.util.List[String]].size() mustEqual 3 + res.asInstanceOf[java.util.List[String]].asScala mustEqual List("a", "b", "c") + } + } + "parse lists with custom delimiter" >> { + val trans = Expression("parseList('string', $0, '%')") + foreach(Seq(trans.apply(Array("a%b%c")), trans.eval(Array("a%b%c")))) { res => + res must not(beNull) + res.asInstanceOf[AnyRef] must beAnInstanceOf[java.util.List[String]] + res.asInstanceOf[java.util.List[String]].size() mustEqual 3 + res.asInstanceOf[java.util.List[String]].asScala mustEqual List("a", "b", "c") + } + } + "parse lists with numbers" >> { + val trans = Expression("parseList('int', $0, '%')") + foreach(Seq(trans.apply(Array("1%2%3")), trans.eval(Array("1%2%3")))) { res => + res must not(beNull) + res.asInstanceOf[AnyRef] must beAnInstanceOf[java.util.List[Int]] + res.asInstanceOf[java.util.List[Int]].size() mustEqual 3 + res.asInstanceOf[java.util.List[Int]].asScala mustEqual List(1, 2, 3) + } +>>>>>>> locationtech-main +<<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -91193,6 +92402,127 @@ class ExpressionTest extends Specification { ======= >>>>>>> 58d14a257 (GEOMESA-3254 Add Bloop build support) ======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +======= +<<<<<<< HEAD +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') + } + "parse null lists" >> { + val trans = Expression("parseList('int', $0)") + trans.apply(Array(null)) must beNull + trans.apply(Array("")) mustEqual Collections.emptyList[Int]() + trans.eval(Array(null)) must beNull + trans.eval(Array("")) mustEqual Collections.emptyList[Int]() +<<<<<<< HEAD +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null lists" >> { + val trans = Expression("parseList('int', $0)") + trans.apply(Array(null)) must beNull + trans.apply(Array("")) mustEqual Collections.emptyList[Int]() + trans.eval(Array(null)) must beNull + trans.eval(Array("")) mustEqual Collections.emptyList[Int]() +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null lists" >> { + val trans = Expression("parseList('int', $0)") + trans.apply(Array(null)) must beNull + trans.apply(Array("")) mustEqual Collections.emptyList[Int]() + trans.eval(Array(null)) must beNull + trans.eval(Array("")) mustEqual Collections.emptyList[Int]() +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null lists" >> { + val trans = Expression("parseList('int', $0)") + trans.apply(Array(null)) must beNull + trans.apply(Array("")) mustEqual Collections.emptyList[Int]() + trans.eval(Array(null)) must beNull + trans.eval(Array("")) mustEqual Collections.emptyList[Int]() +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null lists" >> { + val trans = Expression("parseList('int', $0)") + trans.apply(Array(null)) must beNull + trans.apply(Array("")) mustEqual Collections.emptyList[Int]() + trans.eval(Array(null)) must beNull + trans.eval(Array("")) mustEqual Collections.emptyList[Int]() +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null lists" >> { + val trans = Expression("parseList('int', $0)") + trans.apply(Array(null)) must beNull + trans.apply(Array("")) mustEqual Collections.emptyList[Int]() + trans.eval(Array(null)) must beNull + trans.eval(Array("")) mustEqual Collections.emptyList[Int]() +<<<<<<< HEAD +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) + } + "parse null lists" >> { + val trans = Expression("parseList('int', $0)") + trans.apply(Array(null)) must beNull + trans.apply(Array("")) mustEqual Collections.emptyList[Int]() + trans.eval(Array(null)) must beNull + trans.eval(Array("")) mustEqual Collections.emptyList[Int]() + } + "parse null lists" >> { + val trans = Expression("parseList('int', $0)") + trans.eval(Array(null)) must beNull + trans.eval(Array("")) mustEqual Collections.emptyList[Int]() +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } <<<<<<< HEAD ======= @@ -96018,6 +97348,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -96074,6 +97405,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("1%2%a")).asInstanceOf[java.util.List[Int]] must throwAn[IllegalArgumentException] } "parse maps with default delimiter" >> { @@ -96087,6 +97421,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -96186,6 +97521,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "parse maps with custom delimiter" >> { val trans = Expression("parseMap('String->Int', $0, '%', ';')") @@ -96306,6 +97644,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c83e8187d (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -105776,6 +107115,10 @@ class ExpressionTest extends Specification { >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') trans.apply(Array(null)) must beNull trans.apply(Array("")) mustEqual Collections.emptyMap[String, Int]() +======= + trans.apply(Array(null)) must beNull + trans.apply(Array("")) mustEqual Collections.emptyMap[String, Int]() +>>>>>>> locationtech-main ======= ======= ======= @@ -106091,7 +107434,10 @@ class ExpressionTest extends Specification { trans.eval(Array(null)) must beNull trans.eval(Array("")) mustEqual Collections.emptyMap[String, Int]() >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main } "throw exception for invalid map values" >> { val trans = Expression("parseMap('String->Int', $0)") @@ -106100,6 +107446,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= trans.eval(Array("a->1,b->2,c->d")) must throwAn[IllegalArgumentException] >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -106219,6 +107566,11 @@ class ExpressionTest extends Specification { trans.eval(Array("a->1,b->2,c->d")) must throwAn[IllegalArgumentException] >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + trans.eval(Array("a->1,b->2,c->d")) must throwAn[IllegalArgumentException] +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "handle default values" >> { val trans = Expression("withDefault($0, 'foo')") @@ -106228,6 +107580,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -106380,12 +107733,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= trans.eval(Array(null)) mustEqual "foo" trans.eval(Array("bar")) mustEqual "bar" trans.eval(Array("")) mustEqual "" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "convert integer to boolean" >> { val trans = Expression("intToBoolean($0)") @@ -106398,6 +107756,186 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 5a4c24e020 (GEOMESA-3254 Add Bloop build support) +======= +>>>>>>> b117271d95 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +>>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 397a13ab3c (GEOMESA-3071 Move all converter state into evaluation context) +======= +<<<<<<< HEAD +>>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> location-main +======= +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> afff6fd74b (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> f1532f2313 (GEOMESA-3254 Add Bloop build support) +======= +>>>>>>> 7564665969 (GEOMESA-3254 Add Bloop build support) +======= +======= +>>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 2ae5d0a688 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> b117271d95 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main + trans.eval(Array(null)) mustEqual null + trans.eval(Array(1)) mustEqual true + trans.eval(Array(0)) mustEqual false + trans.eval(Array(-20)) mustEqual true + trans.eval(Array(10000)) mustEqual true + trans.eval(Array(2.2)) must throwA[ClassCastException] +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 6519fcd623 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 2ae5d0a688 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> b117271d95 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +>>>>>>> 1ba2f23b3d (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 74661c3147 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main +======= +>>>>>>> d845d7c1bd (GEOMESA-3254 Add Bloop build support) +======= +>>>>>>> 58d14a257e (GEOMESA-3254 Add Bloop build support) +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 63a045a753 (GEOMESA-3254 Add Bloop build support) +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> locationtech-main +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 397a13ab3c (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +>>>>>>> location-main +======= +<<<<<<< HEAD +======= +>>>>>>> 1ba2f23b3d (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> afff6fd74b (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 6519fcd623 (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> d845d7c1bd (GEOMESA-3254 Add Bloop build support) +>>>>>>> f1532f2313 (GEOMESA-3254 Add Bloop build support) +======= +>>>>>>> 7564665969 (GEOMESA-3254 Add Bloop build support) +======= +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 2ae5d0a688 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 5a4c24e020 (GEOMESA-3254 Add Bloop build support) +======= +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 397a13ab3c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> b117271d95 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main + } + "strip quotes" >> { + val trans = Expression("stripQuotes($0)") + trans.apply(Array("'foo'")) mustEqual "foo" + trans.apply(Array("\"foo'")) mustEqual "foo" + trans.apply(Array("\"'foo'")) mustEqual "foo" +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -106456,16 +107994,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main -======= -======= ->>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) - trans.eval(Array(null)) mustEqual null - trans.eval(Array(1)) mustEqual true - trans.eval(Array(0)) mustEqual false - trans.eval(Array(-20)) mustEqual true - trans.eval(Array(10000)) mustEqual true - trans.eval(Array(2.2)) must throwA[ClassCastException] -<<<<<<< HEAD + trans.eval(Array("'foo'")) mustEqual "foo" + trans.eval(Array("\"foo'")) mustEqual "foo" + trans.eval(Array("\"'foo'")) mustEqual "foo" <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -106557,176 +108088,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= ->>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) - } - "strip quotes" >> { - val trans = Expression("stripQuotes($0)") - trans.apply(Array("'foo'")) mustEqual "foo" - trans.apply(Array("\"foo'")) mustEqual "foo" - trans.apply(Array("\"'foo'")) mustEqual "foo" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ======= -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 5a4c24e020 (GEOMESA-3254 Add Bloop build support) -======= ->>>>>>> b117271d95 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= ->>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 397a13ab3c (GEOMESA-3071 Move all converter state into evaluation context) -======= -<<<<<<< HEAD ->>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> location-main -======= -======= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> afff6fd74b (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> f1532f2313 (GEOMESA-3254 Add Bloop build support) -======= ->>>>>>> 7564665969 (GEOMESA-3254 Add Bloop build support) -======= -======= ->>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> 2ae5d0a688 (GEOMESA-3071 Move all converter state into evaluation context) -======= -======= ->>>>>>> b117271d95 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> locationtech-main trans.eval(Array("'foo'")) mustEqual "foo" trans.eval(Array("\"foo'")) mustEqual "foo" trans.eval(Array("\"'foo'")) mustEqual "foo" -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) -======= -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 6519fcd623 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 2ae5d0a688 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> b117271d95 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> locationtech-main ->>>>>>> 1ba2f23b3d (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> 74661c3147 (GEOMESA-3071 Move all converter state into evaluation context) -<<<<<<< HEAD -======= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> locationtech-main -======= ->>>>>>> d845d7c1bd (GEOMESA-3254 Add Bloop build support) -======= ->>>>>>> 58d14a257e (GEOMESA-3254 Add Bloop build support) -<<<<<<< HEAD -======= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> locationtech-main -======= ->>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 63a045a753 (GEOMESA-3254 Add Bloop build support) -<<<<<<< HEAD -======= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> locationtech-main -======= ->>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> 397a13ab3c (GEOMESA-3071 Move all converter state into evaluation context) -======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> 6e6d5a01cd (GEOMESA-3071 Move all converter state into evaluation context) -<<<<<<< HEAD ->>>>>>> location-main -======= <<<<<<< HEAD +>>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) ======= ->>>>>>> 1ba2f23b3d (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> afff6fd74b (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 6519fcd623 (GEOMESA-3071 Move all converter state into evaluation context) -======= -======= ->>>>>>> d845d7c1bd (GEOMESA-3254 Add Bloop build support) ->>>>>>> f1532f2313 (GEOMESA-3254 Add Bloop build support) -======= ->>>>>>> 7564665969 (GEOMESA-3254 Add Bloop build support) -======= -======= ->>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> b17adcecc4 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> 2ae5d0a688 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 5a4c24e020 (GEOMESA-3254 Add Bloop build support) -======= -======= ->>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> 397a13ab3c (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> b117271d95 (GEOMESA-3071 Move all converter state into evaluation context) -======= ->>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main -======= -======= - trans.eval(Array("'foo'")) mustEqual "foo" - trans.eval(Array("\"foo'")) mustEqual "foo" - trans.eval(Array("\"'foo'")) mustEqual "foo" ->>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ->>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) // white space is preserved trans.apply(Array("'foo\t\t")) mustEqual "foo\t\t" @@ -106735,13 +108107,17 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= trans.eval(Array("'foo\t\t")) mustEqual "foo\t\t" trans.eval(Array(" foo'\"\"")) mustEqual " foo" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -106860,6 +108236,8 @@ class ExpressionTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "strip whitespace" >> { val trans = Expression("strip($0)") @@ -106868,6 +108246,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= trans.eval(Array("\t foo \t\t\t")) mustEqual "foo" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -106987,6 +108366,11 @@ class ExpressionTest extends Specification { trans.eval(Array("\t foo \t\t\t")) mustEqual "foo" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + trans.eval(Array("\t foo \t\t\t")) mustEqual "foo" +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "strip from start and end with strip" >> { val trans = Expression("strip($0, '\\'')") @@ -106997,6 +108381,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -107149,12 +108534,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= trans.eval(Array("'foo'")) mustEqual "foo" trans.eval(Array("'foo")) mustEqual "foo" trans.eval(Array("foo'")) mustEqual "foo" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "strip multiple chars (e.g. quotes)" >> { val trans = Expression("strip($0, '\\'\\\"')") @@ -107167,6 +108557,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -107228,6 +108619,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("'foo'")) mustEqual "foo" trans.eval(Array("\"foo'")) mustEqual "foo" trans.eval(Array("\"'foo'")) mustEqual "foo" @@ -107236,6 +108630,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -107327,6 +108722,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "strip prefix only" >> { val trans = Expression("stripPrefix($0, '\\'')") @@ -107338,6 +108736,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -107399,6 +108798,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("'foo'", "'")) mustEqual "foo'" trans.eval(Array("'foo", "'")) mustEqual "foo" trans.eval(Array("foo'", "'")) mustEqual "foo'" @@ -107406,6 +108808,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -107497,6 +108900,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "strip prefix with multiple chars" >> { val trans = Expression("stripPrefix($0, '\\'\\\"')") @@ -107509,6 +108915,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -107570,6 +108977,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("'foo'", "'")) mustEqual "foo'" trans.eval(Array("'foo", "'")) mustEqual "foo" trans.eval(Array("foo'", "'")) mustEqual "foo'" @@ -107578,6 +108988,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -107669,6 +109080,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "strip suffix only" >> { val trans = Expression("stripSuffix($0, '\\'')") @@ -107679,6 +109093,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -107831,12 +109246,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= trans.eval(Array("'foo'")) mustEqual "'foo" trans.eval(Array("'foo")) mustEqual "'foo" trans.eval(Array("foo'")) mustEqual "foo" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "strip suffix with preserving whitespace" >> { val trans = Expression("stripSuffix($0, 'ab')") @@ -107845,6 +109265,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= trans.eval(Array("fooab ")) mustEqual "fooab " >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -107964,6 +109385,11 @@ class ExpressionTest extends Specification { trans.eval(Array("fooab ")) mustEqual "fooab " >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + trans.eval(Array("fooab ")) mustEqual "fooab " +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "strip suffix multiple chars" >> { val trans = Expression("stripSuffix($0, '\\'\\\"')") @@ -107977,6 +109403,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -108038,6 +109465,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("'\"foo'")) mustEqual "'\"foo" trans.eval(Array("'\"foo")) mustEqual "'\"foo" trans.eval(Array("\"foo'")) mustEqual "\"foo" @@ -108047,6 +109477,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -108138,6 +109569,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "strip something other than quotes" >> { val trans = Expression("strip($0, 'X')") @@ -108148,6 +109582,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -108300,12 +109735,17 @@ class ExpressionTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= trans.eval(Array("XfooX")) mustEqual "foo" trans.eval(Array("Xfoo")) mustEqual "foo" trans.eval(Array("fooX")) mustEqual "foo" >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "remove strings" >> { val trans = Expression("remove($0, '\\'')") @@ -108318,6 +109758,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -108379,6 +109820,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("'foo'")) mustEqual "foo" trans.eval(Array("'foo")) mustEqual "foo" trans.eval(Array("foo'")) mustEqual "foo" @@ -108387,6 +109831,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -108478,6 +109923,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "replace" >> { val trans = Expression("replace($0, '\\'', '\\\"')") @@ -108501,6 +109949,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b17adcecc (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -108568,6 +110017,9 @@ class ExpressionTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main trans.eval(Array("'foo'")) mustEqual "\"foo\"" trans.eval(Array("'foo")) mustEqual "\"foo" trans.eval(Array("foo'")) mustEqual "foo\"" @@ -108576,6 +110028,7 @@ class ExpressionTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -108868,6 +110321,9 @@ class ExpressionTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } "select a list item" >> { val exp = Expression("listItem($0,1)") diff --git a/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/MiscFunctionFactoryTest.scala b/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/MiscFunctionFactoryTest.scala index 07b6097f4e2c..cc56701e5658 100644 --- a/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/MiscFunctionFactoryTest.scala +++ b/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/MiscFunctionFactoryTest.scala @@ -53,6 +53,7 @@ class MiscFunctionFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -165,6 +166,10 @@ class MiscFunctionFactoryTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } diff --git a/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/PredicateTest.scala b/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/PredicateTest.scala index 225a92aa23be..3beef8d13ef2 100644 --- a/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/PredicateTest.scala +++ b/geomesa-convert/geomesa-convert-common/src/test/scala/org/locationtech/geomesa/convert2/transforms/PredicateTest.scala @@ -28,13 +28,17 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1", "2")) must beFalse pred.eval(Array("", "1", "1")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -153,6 +157,8 @@ class PredicateTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare string not equals" >> { @@ -163,13 +169,17 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1", "2")) must beTrue pred.eval(Array("", "1", "1")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -288,6 +298,8 @@ class PredicateTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "compare int equals" >> { foreach(Seq("intEq($1::int, $2::int)", "$1::int == $2::int")) { s => @@ -298,13 +310,17 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1", "2")) must beFalse pred.eval(Array("", "1", "1")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -423,6 +439,8 @@ class PredicateTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare integer equals" >> { @@ -434,13 +452,17 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1", "2")) must beFalse pred.eval(Array("", "1", "1")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -559,6 +581,8 @@ class PredicateTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare nested int equals" >> { @@ -570,13 +594,17 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "3", "foo")) must beTrue pred.eval(Array("", "4", "foo")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -695,6 +723,8 @@ class PredicateTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare int lteq" >> { @@ -707,6 +737,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -859,12 +890,17 @@ class PredicateTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1", "2")) must beTrue pred.eval(Array("", "1", "1")) must beTrue pred.eval(Array("", "1", "0")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare int lt" >> { @@ -876,13 +912,17 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1", "2")) must beTrue pred.eval(Array("", "1", "1")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1001,6 +1041,8 @@ class PredicateTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare int gteq" >> { @@ -1013,6 +1055,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1165,12 +1208,17 @@ class PredicateTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1", "2")) must beFalse pred.eval(Array("", "1", "1")) must beTrue pred.eval(Array("", "2", "1")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare int gt" >> { @@ -1183,6 +1231,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1335,12 +1384,17 @@ class PredicateTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1", "2")) must beFalse pred.eval(Array("", "1", "1")) must beFalse pred.eval(Array("", "2", "1")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare double equals" >> { @@ -1352,13 +1406,17 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1.0", "2.0")) must beFalse pred.eval(Array("", "1.0", "1.0")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1477,6 +1535,8 @@ class PredicateTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare double lteq" >> { @@ -1489,6 +1549,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1641,12 +1702,17 @@ class PredicateTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1.0", "2.0")) must beTrue pred.eval(Array("", "1.0", "1.0")) must beTrue pred.eval(Array("", "1.0", "0.0")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare double lt" >> { @@ -1658,13 +1724,17 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1.0", "2.0")) must beTrue pred.eval(Array("", "1.0", "1.0")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1783,6 +1853,8 @@ class PredicateTest extends Specification { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare double gteq" >> { @@ -1795,6 +1867,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1947,12 +2020,17 @@ class PredicateTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1.0", "2.0")) must beFalse pred.eval(Array("", "1.0", "1.0")) must beTrue pred.eval(Array("", "2.0", "1.0")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare double gt" >> { @@ -1965,6 +2043,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2117,12 +2196,17 @@ class PredicateTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "1.0", "2.0")) must beFalse pred.eval(Array("", "1.0", "1.0")) must beFalse pred.eval(Array("", "2.0", "1.0")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } "compare not predicates" >> { @@ -2133,6 +2217,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= pred.eval(Array("", "1", "1")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -2252,6 +2337,11 @@ class PredicateTest extends Specification { pred.eval(Array("", "1", "1")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + pred.eval(Array("", "1", "1")) must beFalse +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } "compare and predicates" >> { @@ -2262,6 +2352,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= pred.eval(Array("", "foo", "foo", "f", "oo")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -2381,6 +2472,11 @@ class PredicateTest extends Specification { pred.eval(Array("", "foo", "foo", "f", "oo")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + pred.eval(Array("", "foo", "foo", "f", "oo")) must beTrue +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } "compare or predicates" >> { @@ -2391,6 +2487,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= pred.eval(Array("", "foo", "foo", "f", "oo")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -2510,6 +2607,11 @@ class PredicateTest extends Specification { pred.eval(Array("", "foo", "foo", "f", "oo")) must beTrue >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + pred.eval(Array("", "foo", "foo", "f", "oo")) must beTrue +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main } } "compare grouped predicates" >> { @@ -2527,6 +2629,7 @@ class PredicateTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2679,12 +2782,17 @@ class PredicateTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= pred.eval(Array("", "foo", "foo", "f", "foo")) must beTrue pred.eval(Array("", "foo", "foo", "f", "oo")) must beFalse pred.eval(Array("", "foo", "fo", "f", "foo")) must beFalse >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } } } diff --git a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml index 3dc6f50f93fb..66a4d8fd6d0a 100644 --- a/geomesa-convert/geomesa-convert-fixedwidth/pom.xml +++ b/geomesa-convert/geomesa-convert-fixedwidth/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-fixedwidth/src/main/scala/org/locationtech/geomesa/convert/fixedwidth/FixedWidthConverter.scala b/geomesa-convert/geomesa-convert-fixedwidth/src/main/scala/org/locationtech/geomesa/convert/fixedwidth/FixedWidthConverter.scala index 4326dad28de6..fae440c503a7 100644 --- a/geomesa-convert/geomesa-convert-fixedwidth/src/main/scala/org/locationtech/geomesa/convert/fixedwidth/FixedWidthConverter.scala +++ b/geomesa-convert/geomesa-convert-fixedwidth/src/main/scala/org/locationtech/geomesa/convert/fixedwidth/FixedWidthConverter.scala @@ -65,6 +65,7 @@ object FixedWidthConverter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -121,6 +122,9 @@ object FixedWidthConverter { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main private val mutableArray = Array.ofDim[AnyRef](1) override val fieldArg: Option[Array[AnyRef] => AnyRef] = Some(values) @@ -133,6 +137,7 @@ object FixedWidthConverter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -227,6 +232,9 @@ object FixedWidthConverter { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main private def values(args: Array[AnyRef]): AnyRef = args(0).asInstanceOf[String].substring(start, endIdx) } diff --git a/geomesa-convert/geomesa-convert-jdbc/pom.xml b/geomesa-convert/geomesa-convert-jdbc/pom.xml index 838441d185f1..233587e283c0 100644 --- a/geomesa-convert/geomesa-convert-jdbc/pom.xml +++ b/geomesa-convert/geomesa-convert-jdbc/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-json/pom.xml b/geomesa-convert/geomesa-convert-json/pom.xml index 805ed3991c13..bef4a70d7ecb 100644 --- a/geomesa-convert/geomesa-convert-json/pom.xml +++ b/geomesa-convert/geomesa-convert-json/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonFunctionFactory.scala b/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonFunctionFactory.scala index 4513c1a2ed6c..305c965b1490 100644 --- a/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-json/src/main/scala/org/locationtech/geomesa/convert/json/JsonFunctionFactory.scala @@ -137,6 +137,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') @@ -344,12 +345,15 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -370,12 +374,15 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 1ec3ea887f (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -396,6 +403,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 1b600f3f7a (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -404,6 +413,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -575,6 +585,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -603,6 +617,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -706,6 +721,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -713,6 +730,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -785,12 +803,18 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -847,11 +871,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -866,6 +893,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main >>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -873,6 +902,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -894,6 +924,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -901,6 +933,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -925,11 +958,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -962,10 +998,13 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -987,6 +1026,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -1066,6 +1107,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -8783,6 +8825,16 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) ======= Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject) +======= +======= +>>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) + Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) +======= + Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject) +>>>>>>> locationtech-main >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD @@ -8804,6 +8856,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 254d97a0a7 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -9076,6 +9129,16 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 3c53246c9a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -9089,6 +9152,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -9140,6 +9204,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 27353f52e5 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -9153,6 +9219,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -9668,6 +9735,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> c52bac169a (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 3c53246c9a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -9701,6 +9776,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03967b3f4 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -9883,6 +9959,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> eb01a83daf (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -9891,6 +9971,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +<<<<<<< HEAD >>>>>>> 1bc88f7e23 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 01daab72fe (GEOMESA-3109 Json array to object converter function (#2788)) @@ -9938,6 +10019,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> fd97977f9c (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +>>>>>>> locationtech-main ======= Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -9956,6 +10039,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10616,6 +10700,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> f54ebeac7e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= >>>>>>> locationtech-main Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -10636,6 +10728,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -10833,10 +10926,20 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 0b213b35a8 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD +======= +>>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= ======= Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f8f49130b1 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -10855,6 +10958,9 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> a3e5500db0 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -10864,6 +10970,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 008feb67a (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -10898,6 +11005,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 65360f96a0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +======= +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -10909,6 +11022,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 541f1862a7 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -10918,6 +11032,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> bd6dd934cc (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) @@ -10927,6 +11043,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4c9fb0f6e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -10942,6 +11059,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 91b0d6a88 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= ======= Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -10952,6 +11071,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3c4fc5a828 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -14420,6 +14540,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -14430,6 +14552,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 35b3ecb03d (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> a539011150 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -15217,6 +15340,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= ======= ======= Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) @@ -15224,6 +15349,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +<<<<<<< HEAD >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') >>>>>>> 1b5719bd3 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -15399,6 +15525,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= + Seq(jsonToString, jsonListParser, jsonMapParser, mapToJson, jsonPath, jsonArrayToObject, newJsonObject, emptyToNull) +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main @deprecated("use toString") private val jsonToString = TransformerFunction.pure("jsonToString", "json2string") { args => @@ -15607,6 +15737,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -16435,11 +16566,17 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 1bc88f7e23 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -17270,6 +17407,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> b586a90765 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -17283,6 +17422,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -17303,6 +17443,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -17315,6 +17457,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> location-main @@ -17538,6 +17681,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> b586a90765 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 4aef7a70f (GEOMESA-3109 Json array to object converter function (#2788)) @@ -17584,6 +17735,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6449641e67 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -17661,6 +17813,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> eb01a83daf (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -17669,6 +17825,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +<<<<<<< HEAD >>>>>>> 1bc88f7e23 (GEOMESA-3109 Json array to object converter function (#2788)) ======= <<<<<<< HEAD @@ -17694,6 +17851,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 2ef7cb6fbd (GEOMESA-3109 Json array to object converter function (#2788)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -17714,6 +17873,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6449641e67 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -18979,6 +19139,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> locationtech-main ======= ======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -18997,6 +19163,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -19339,10 +19506,18 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fd0793971d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -23088,10 +23263,19 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +<<<<<<< HEAD >>>>>>> 8999b3f6b9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> c0dc422e2 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -23165,10 +23349,22 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 91b0d6a88 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 49d3846b23 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -23181,6 +23377,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -23190,6 +23388,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 09c8a6d2f (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> 0686300b33 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -23202,11 +23401,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 1b5719bd3 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') @@ -23370,6 +23572,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main private val newJsonObject = TransformerFunction.pure("newJsonObject") { args => val obj = new JsonObject() var i = 1 @@ -23420,6 +23626,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) @@ -23608,6 +23815,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -23622,6 +23831,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) @@ -24136,6 +24346,11 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= >>>>>>> fa049272d1 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= <<<<<<< HEAD @@ -24173,6 +24388,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) @@ -28807,24 +29023,41 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 5f83b35214 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f66072323 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> f43f8303d3 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) ======= +<<<<<<< HEAD +======= +>>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> ee3aea1cdc (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -28834,9 +29067,20 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD >>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> c8421ce4b1 (GEOMESA-3100 Kafka layer views (#2784)) @@ -28927,11 +29171,26 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 4231e686dd (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> d309fbbbbf (GEOMESA-3100 Kafka layer views (#2784)) ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main +======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8037623548 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 02fea6930b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -28955,9 +29214,16 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ca22354dd7 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> a773c6ef65 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -28973,6 +29239,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= ======= >>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -28984,12 +29254,15 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2d758409cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> b586a90765 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -28999,17 +29272,21 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ea0ead77fe (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 52803e45bd (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4adaa7f479 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> d3b123117a (GEOMESA-3100 Kafka layer views (#2784)) @@ -29028,11 +29305,16 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6af71ff432 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 885048dd7d (GEOMESA-3100 Kafka layer views (#2784)) @@ -29041,6 +29323,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -29049,6 +29333,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 44b15e96d9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 813cf035d0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -30299,6 +30584,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main args(i) match { case null => // skip nulls case j: JsonElement => obj.add(key, j) @@ -30361,6 +30652,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 42549e8e3 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -31276,11 +31568,16 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 28427dfd8f (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -31626,6 +31923,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -31639,6 +31942,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e0773a1bd7 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -32896,6 +33200,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main } ======= @@ -32946,6 +33256,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 84634d919 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -33435,11 +33746,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1bfc4f74c8 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -33459,6 +33773,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> locationtech-main >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -33468,6 +33784,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -33818,6 +34135,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD >>>>>>> fa049272d1 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 58286bfd3 (GEOMESA-3100 Kafka layer views (#2784)) } @@ -33825,6 +34144,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -33859,6 +34179,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD @@ -33890,6 +34212,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c1d0543aac (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -34528,11 +34851,16 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 28427dfd8f (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -34878,6 +35206,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> a1ccc017c6 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -34891,6 +35225,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 797b02396b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -36166,6 +36501,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 6ee72f98ac (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main val value = args(i) match { case null => JsonNull.INSTANCE case j: JsonElement => j @@ -36181,6 +36522,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -36232,6 +36574,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD @@ -36327,6 +36671,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 254d97a0a7 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -37168,6 +37513,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> c7b6fe2393 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) @@ -37175,6 +37522,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9a5d6d2815 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -37593,6 +37941,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 3c53246c9a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) @@ -37603,6 +37953,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -37862,6 +38213,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 7103b25bb7 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) @@ -37871,6 +38224,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 5d898c0c52 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -38185,11 +38539,17 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> afc081190 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main ======= +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -41683,6 +42043,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD ======= >>>>>>> 7103b25bb7 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -41693,11 +42055,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -41706,6 +42071,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> location-main @@ -42825,6 +43191,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 7103b25bb7 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main } >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) @@ -42849,6 +43219,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c1bc2bba7f (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -45765,6 +46136,9 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 5f83b35214 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -45792,6 +46166,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6055a8bb0c (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> ca0e7f9e23 (GEOMESA-3100 Kafka layer views (#2784)) @@ -46436,11 +46811,16 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD >>>>>>> 1bfc4f74c8 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -46458,6 +46838,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) ======= +<<<<<<< HEAD >>>>>>> c1872b9c98 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -46881,6 +47262,15 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -46889,6 +47279,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 275e53813 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 9b5d82faee (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -46978,10 +47369,23 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +======= +>>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d451bccb18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 7abafecb1 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -47028,10 +47432,17 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fe3378ccaa (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> afc081190 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -47130,6 +47541,27 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 9e74e1d9b4 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 304d8d4049 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +>>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) +======= >>>>>>> locationtech-main } @@ -47140,6 +47572,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89fb9950e (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> bc97b07a31 (GEOMESA-3100 Kafka layer views (#2784)) @@ -47161,12 +47594,15 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1b5719bd3 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> e4ee051914 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -47188,6 +47624,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -47196,6 +47634,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e7bfe001d (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> a09ef82d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -47216,12 +47655,15 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= } >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1b25d7ddb (Merge branch 'feature/postgis-fixes') >>>>>>> 699117eca9 (Merge branch 'feature/postgis-fixes') ======= @@ -47470,6 +47912,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main i += 2 } obj @@ -47593,6 +48037,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -48575,6 +49020,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 585cc74744 (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +>>>>>>> 2c3111e68 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) @@ -48583,6 +49032,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main @@ -50322,6 +50772,9 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 29f1317169 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -50363,6 +50816,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a773c6ef65 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 45dca3e079 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -50482,6 +50936,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 89971e000d (GEOMESA-3109 Json array to object converter function (#2788)) ======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -50490,10 +50950,13 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7a3d004ad (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> b586a90765 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main >>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -50502,6 +50965,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -50559,6 +51023,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> a773c6ef65 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -50599,6 +51067,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 35d929bd27 (GEOMESA-3109 Json array to object converter function (#2788)) ======= @@ -51881,6 +52350,14 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> locationtech-main ======= ======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 64d8177ac (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD @@ -51896,6 +52373,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -52374,9 +52852,25 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> location-main ======= ======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 7a670f84c (GEOMESA-3109 Json array to object converter function (#2788)) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= +======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 31b03236c (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -52453,6 +52947,12 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> locationtech-main ======= ======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 097b5a085 (GEOMESA-3109 Json array to object converter function (#2788)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -52460,6 +52960,9 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main ======= @@ -52467,6 +52970,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54da398207 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -55453,11 +55957,20 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars >>>>>>> 0b22bfaa87 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> c44517c36 (GEOMESA-3109 Json array to object converter function (#2788)) +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1e76dbd1e (GEOMESA-3109 Json array to object converter function (#2788)) >>>>>>> 9759ddc1b (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -55473,6 +55986,10 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= @@ -55486,6 +56003,7 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0f0dd6560e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -56010,6 +56528,8 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -56019,16 +56539,20 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars <<<<<<< HEAD >>>>>>> 235691f96 (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 35b3ecb03d (GEOMESA-3109 Json array to object converter function (#2788)) <<<<<<< HEAD >>>>>>> a539011150 (GEOMESA-3109 Json array to object converter function (#2788)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 44b15e96d9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 813cf035d0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -57200,5 +57724,9 @@ class JsonFunctionFactory extends TransformerFunctionFactory with CollectionPars ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main private def getPrimitive(p: JsonPrimitive): Any = if (p.isBoolean) { p.getAsBoolean } else { p.getAsString } } diff --git a/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala b/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala index 32f188aa37a8..0e51cd0c5158 100644 --- a/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala +++ b/geomesa-convert/geomesa-convert-json/src/test/scala/org/locationtech/geomesa/convert/json/JsonConverterTest.scala @@ -1417,6 +1417,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7ab33423d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -3700,6 +3701,12 @@ class JsonConverterTest extends Specification { >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> daa600442f (GEOMESA-3071 Move all converter state into evaluation context) ======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -3728,6 +3735,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6289007008 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> efae05a8fa (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -3796,11 +3804,16 @@ class JsonConverterTest extends Specification { ======= >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 0d96d8bd55 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -3817,6 +3830,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 275e53813f (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -4583,6 +4597,12 @@ class JsonConverterTest extends Specification { >>>>>>> locationtech-main ======= ======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -4599,6 +4619,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -4935,10 +4956,18 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fd0793971d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -8420,10 +8449,19 @@ class JsonConverterTest extends Specification { ======= ======= ======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= +<<<<<<< HEAD >>>>>>> 8999b3f6b9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> d9a9062a0 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -8497,10 +8535,22 @@ class JsonConverterTest extends Specification { ======= ======= ======= +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 91b0d6a88 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 49d3846b23 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -8513,6 +8563,8 @@ class JsonConverterTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -8522,6 +8574,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 81b8eb5ae (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 55324ccde8 (GEOMESA-3071 Move all converter state into evaluation context) @@ -8534,11 +8587,14 @@ class JsonConverterTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 1b5719bd3 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') @@ -8702,6 +8758,10 @@ class JsonConverterTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "create json object attributes" >> { val sft = SimpleFeatureTypes.createType("objects", "foobar:String:json=true") @@ -8866,6 +8926,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -9980,6 +10041,10 @@ class JsonConverterTest extends Specification { >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> d9cbd16a76 (GEOMESA-3071 Move all converter state into evaluation context) ======= +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -9987,6 +10052,7 @@ class JsonConverterTest extends Specification { >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 77e09b8aaa (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 72121f1076 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -11850,6 +11916,9 @@ class JsonConverterTest extends Specification { >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0da1bb22c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -11873,6 +11942,7 @@ class JsonConverterTest extends Specification { >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> 26fc359a06 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -12159,6 +12229,8 @@ class JsonConverterTest extends Specification { ======= >>>>>>> 3c53246c9a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -12178,6 +12250,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 45dca3e079 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -12253,6 +12326,12 @@ class JsonConverterTest extends Specification { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -12262,6 +12341,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7a3d004ad (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -12283,6 +12363,8 @@ class JsonConverterTest extends Specification { >>>>>>> 7a3d004ad (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 3c53246c9a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -12294,6 +12376,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -12334,6 +12417,11 @@ class JsonConverterTest extends Specification { >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> locationtech-main >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -12345,6 +12433,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -12518,6 +12607,8 @@ class JsonConverterTest extends Specification { ======= >>>>>>> 3c53246c9a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD @@ -12539,6 +12630,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 58f72e76c (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -12980,12 +13072,16 @@ class JsonConverterTest extends Specification { >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD +======= +======= +>>>>>>> locationtech-main >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -13146,6 +13242,9 @@ class JsonConverterTest extends Specification { ======= >>>>>>> locationtech-main ======= +>>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) @@ -13161,6 +13260,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -13665,10 +13765,26 @@ class JsonConverterTest extends Specification { >>>>>>> locationtech-main ======= ======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= +======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -13729,6 +13845,12 @@ class JsonConverterTest extends Specification { >>>>>>> locationtech-main ======= ======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -13736,6 +13858,9 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main ======= @@ -13743,6 +13868,7 @@ class JsonConverterTest extends Specification { ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e0644f7991 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -14116,9 +14242,14 @@ class JsonConverterTest extends Specification { ======= <<<<<<< HEAD ======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -16458,11 +16589,14 @@ class JsonConverterTest extends Specification { >>>>>>> 0b22bfaa87 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17198,6 +17332,8 @@ class JsonConverterTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -17212,6 +17348,7 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4a47c538bc (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> ba177f9f13 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -17467,6 +17604,8 @@ class JsonConverterTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -17476,17 +17615,21 @@ class JsonConverterTest extends Specification { <<<<<<< HEAD >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 81b8eb5aeb (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> b59955740a (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1b5719bd33 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> e41e9641d2 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -18411,6 +18554,10 @@ class JsonConverterTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "infer schema from geojson files" >> { val json = """{ diff --git a/geomesa-convert/geomesa-convert-metrics-cloudwatch/pom.xml b/geomesa-convert/geomesa-convert-metrics-cloudwatch/pom.xml index f8dbb3451258..a7bfd659a950 100644 --- a/geomesa-convert/geomesa-convert-metrics-cloudwatch/pom.xml +++ b/geomesa-convert/geomesa-convert-metrics-cloudwatch/pom.xml @@ -110,6 +110,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1280,11 +1281,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2391,6 +2395,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2399,6 +2405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2891,12 +2898,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3272,6 +3286,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3279,12 +3301,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3325,6 +3351,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3338,6 +3369,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3456,11 +3488,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3471,11 +3507,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3619,6 +3658,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3630,6 +3673,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3908,6 +3952,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3919,6 +3969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4066,6 +4117,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4078,6 +4131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6697,6 +6751,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6793,6 +6849,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8268,6 +8325,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8286,6 +8345,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9781,12 +9841,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12485,6 +12548,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12492,6 +12557,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12534,9 +12600,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14092,6 +14161,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14099,6 +14172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14165,10 +14239,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14186,10 +14285,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14223,19 +14330,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15304,11 +15430,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15326,6 +15457,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-metrics-ganglia/pom.xml b/geomesa-convert/geomesa-convert-metrics-ganglia/pom.xml index e63940721f9e..53e21f4274a1 100644 --- a/geomesa-convert/geomesa-convert-metrics-ganglia/pom.xml +++ b/geomesa-convert/geomesa-convert-metrics-ganglia/pom.xml @@ -110,6 +110,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1280,11 +1281,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2391,6 +2395,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2399,6 +2405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2891,12 +2898,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3272,6 +3286,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3279,12 +3301,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3325,6 +3351,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3338,6 +3369,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3456,11 +3488,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3471,11 +3507,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3619,6 +3658,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3630,6 +3673,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3908,6 +3952,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3919,6 +3969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4066,6 +4117,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4078,6 +4131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6697,6 +6751,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6793,6 +6849,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8268,6 +8325,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8286,6 +8345,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9781,12 +9841,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12485,6 +12548,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12492,6 +12557,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12534,9 +12600,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14092,6 +14161,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14099,6 +14172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14165,10 +14239,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14186,10 +14285,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14223,19 +14330,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15304,11 +15430,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15326,6 +15457,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-metrics-graphite/pom.xml b/geomesa-convert/geomesa-convert-metrics-graphite/pom.xml index 4f20b34cc1bf..095e5f540732 100644 --- a/geomesa-convert/geomesa-convert-metrics-graphite/pom.xml +++ b/geomesa-convert/geomesa-convert-metrics-graphite/pom.xml @@ -110,6 +110,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1280,11 +1281,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2391,6 +2395,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2399,6 +2405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2891,12 +2898,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3272,6 +3286,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3279,12 +3301,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3325,6 +3351,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3338,6 +3369,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3456,11 +3488,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3471,11 +3507,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3619,6 +3658,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3630,6 +3673,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3908,6 +3952,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3919,6 +3969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4066,6 +4117,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4078,6 +4131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6697,6 +6751,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6793,6 +6849,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8268,6 +8325,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8286,6 +8345,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9781,12 +9841,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12485,6 +12548,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12492,6 +12557,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12534,9 +12600,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14092,6 +14161,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14099,6 +14172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14165,10 +14239,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14186,10 +14285,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14223,19 +14330,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15304,11 +15430,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15326,6 +15457,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-osm/pom.xml b/geomesa-convert/geomesa-convert-osm/pom.xml index 8e5ad5411641..8776095cf0a9 100644 --- a/geomesa-convert/geomesa-convert-osm/pom.xml +++ b/geomesa-convert/geomesa-convert-osm/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/package.scala b/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/package.scala index cd03613375ee..11ca23c40247 100644 --- a/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/package.scala +++ b/geomesa-convert/geomesa-convert-osm/src/main/scala/org/locationtech/geomesa/convert/osm/package.scala @@ -101,6 +101,7 @@ package object osm { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -162,6 +163,9 @@ package object osm { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = { transforms match { case None => args(lookup) @@ -172,6 +176,7 @@ package object osm { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -263,6 +268,9 @@ package object osm { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main private def values(args: Array[AnyRef]): AnyRef = args(lookup) } diff --git a/geomesa-convert/geomesa-convert-parquet/pom.xml b/geomesa-convert/geomesa-convert-parquet/pom.xml index 77031d48e6d0..086ff18e3b27 100644 --- a/geomesa-convert/geomesa-convert-parquet/pom.xml +++ b/geomesa-convert/geomesa-convert-parquet/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-redis-cache/pom.xml b/geomesa-convert/geomesa-convert-redis-cache/pom.xml index 8d295c509db0..548da1b52917 100644 --- a/geomesa-convert/geomesa-convert-redis-cache/pom.xml +++ b/geomesa-convert/geomesa-convert-redis-cache/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-shp/pom.xml b/geomesa-convert/geomesa-convert-shp/pom.xml index fc3dc050c250..907c03f9d08a 100644 --- a/geomesa-convert/geomesa-convert-shp/pom.xml +++ b/geomesa-convert/geomesa-convert-shp/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-shp/src/main/scala/org/locationtech/geomesa/convert/shp/ShapefileConverter.scala b/geomesa-convert/geomesa-convert-shp/src/main/scala/org/locationtech/geomesa/convert/shp/ShapefileConverter.scala index d4afe0df7300..71d163c06cc1 100644 --- a/geomesa-convert/geomesa-convert-shp/src/main/scala/org/locationtech/geomesa/convert/shp/ShapefileConverter.scala +++ b/geomesa-convert/geomesa-convert-shp/src/main/scala/org/locationtech/geomesa/convert/shp/ShapefileConverter.scala @@ -17,6 +17,7 @@ import com.typesafe.scalalogging.LazyLogging <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -58,6 +59,14 @@ import java.nio.file.{Files, Paths} ======= >>>>>>> 58d14a257e (GEOMESA-3254 Add Bloop build support) +======= +======= +import java.io.InputStream +import java.util.Collections +import java.nio.charset.Charset +import java.nio.file.{Files, Paths} + +>>>>>>> locationtech-main import com.codahale.metrics.Counter <<<<<<< HEAD <<<<<<< HEAD @@ -89,6 +98,7 @@ import com.codahale.metrics.Counter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -256,6 +266,8 @@ import com.typesafe.scalalogging.LazyLogging <<<<<<< HEAD >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 91dbd747c (GEOMESA-2679 Infer encoding of shapefile from cpg file) @@ -263,6 +275,7 @@ import com.typesafe.scalalogging.LazyLogging ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -294,11 +307,14 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 91dbd747c (GEOMESA-2679 Infer encoding of shapefile from cpg file) ======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -345,6 +361,41 @@ import com.typesafe.scalalogging.LazyLogging ======= >>>>>>> a79eaecf5b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main +======= +import com.typesafe.scalalogging.LazyLogging +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +======= +import com.typesafe.scalalogging.LazyLogging +>>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +import com.typesafe.scalalogging.LazyLogging +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +======= +import com.typesafe.scalalogging.LazyLogging +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) +import com.typesafe.scalalogging.LazyLogging +======= +>>>>>>> locationtech-main >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= import com.typesafe.scalalogging.LazyLogging @@ -358,6 +409,7 @@ import com.typesafe.scalalogging.LazyLogging <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -420,6 +472,15 @@ import com.typesafe.scalalogging.LazyLogging ======= >>>>>>> 13d53e6b02 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main +======= +>>>>>>> 91dbd747c (GEOMESA-2679 Infer encoding of shapefile from cpg file) +======= +======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -432,6 +493,7 @@ import com.typesafe.scalalogging.LazyLogging <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -690,11 +752,15 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> 6ac55e1ef7 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= import com.typesafe.scalalogging.LazyLogging ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8caee74520 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -705,6 +771,9 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 7b6034d4cb (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main +======= +======= +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -712,6 +781,7 @@ import com.typesafe.scalalogging.LazyLogging import com.typesafe.scalalogging.LazyLogging >>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -730,10 +800,18 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> e734e4d064 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 626b1ac8c (GEOMESA-2679 Infer encoding of shapefile from cpg file) +======= +>>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= ======= >>>>>>> 91dbd747c (GEOMESA-2679 Infer encoding of shapefile from cpg file) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -743,19 +821,26 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> 999d7f72ee (GEOMESA-2679 Infer encoding of shapefile from cpg file) ======= ======= +>>>>>>> ddc2cffa3 (GEOMESA-2679 Infer encoding of shapefile from cpg file) +>>>>>>> locationtech-main +======= ======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d1cf3ad8b5 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> locationtech-main +======= import com.typesafe.scalalogging.LazyLogging ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4255,6 +4340,8 @@ import com.typesafe.scalalogging.LazyLogging ======= ======= ======= +>>>>>>> locationtech-main +======= import com.typesafe.scalalogging.LazyLogging ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -4263,6 +4350,7 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) >>>>>>> 0e693a1ea (GEOMESA-2679 Infer encoding of shapefile from cpg file) ======= +<<<<<<< HEAD >>>>>>> 21308670a5 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 32bd71824 (GEOMESA-2679 Infer encoding of shapefile from cpg file) <<<<<<< HEAD @@ -4608,6 +4696,12 @@ import com.typesafe.scalalogging.LazyLogging import com.typesafe.scalalogging.LazyLogging >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) +======= +import com.typesafe.scalalogging.LazyLogging +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main import org.geotools.data.shapefile.{ShapefileDataStore, ShapefileDataStoreFactory} import org.geotools.data.{DataStoreFinder, Query} import org.geotools.referencing.CRS @@ -4751,6 +4845,7 @@ object ShapefileConverter extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= val source = io.Source.fromFile(cpgPath.toFile) >>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) @@ -4870,6 +4965,11 @@ object ShapefileConverter extends LazyLogging { val source = io.Source.fromFile(cpgPath.toFile) >>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) >>>>>>> 091d323f5d (GEOMESA-2679 Infer encoding of shapefile from cpg file) +======= +======= + val source = io.Source.fromFile(cpgPath.toFile) +>>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) +>>>>>>> locationtech-main try { source.getLines.take(1).toList match { case Nil => None @@ -4887,6 +4987,7 @@ object ShapefileConverter extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4943,6 +5044,9 @@ object ShapefileConverter extends LazyLogging { ======= ======= >>>>>>> 091d323f5d (GEOMESA-2679 Infer encoding of shapefile from cpg file) +======= +======= +>>>>>>> locationtech-main case e: Exception => logger.warn("Can't figure out charset from cpg file, will use default charset") None @@ -4950,6 +5054,7 @@ object ShapefileConverter extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) ======= <<<<<<< HEAD @@ -5046,6 +5151,9 @@ object ShapefileConverter extends LazyLogging { ======= >>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) >>>>>>> 091d323f5d (GEOMESA-2679 Infer encoding of shapefile from cpg file) +======= +>>>>>>> 20b0d52e9 (GEOMESA-2679 Infer encoding of shapefile from cpg file) +>>>>>>> locationtech-main } } } diff --git a/geomesa-convert/geomesa-convert-simplefeature/pom.xml b/geomesa-convert/geomesa-convert-simplefeature/pom.xml index 36855a299f42..7c1030cc31a6 100644 --- a/geomesa-convert/geomesa-convert-simplefeature/pom.xml +++ b/geomesa-convert/geomesa-convert-simplefeature/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-text/pom.xml b/geomesa-convert/geomesa-convert-text/pom.xml index f28afe2b221e..69f877858c97 100644 --- a/geomesa-convert/geomesa-convert-text/pom.xml +++ b/geomesa-convert/geomesa-convert-text/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-text/src/test/scala/org/locationtech/geomesa/convert/text/DelimitedTextConverterTest.scala b/geomesa-convert/geomesa-convert-text/src/test/scala/org/locationtech/geomesa/convert/text/DelimitedTextConverterTest.scala index d56715d8ef62..ebb918f5953d 100644 --- a/geomesa-convert/geomesa-convert-text/src/test/scala/org/locationtech/geomesa/convert/text/DelimitedTextConverterTest.scala +++ b/geomesa-convert/geomesa-convert-text/src/test/scala/org/locationtech/geomesa/convert/text/DelimitedTextConverterTest.scala @@ -65,6 +65,7 @@ class DelimitedTextConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -121,6 +122,9 @@ class DelimitedTextConverterTest extends Specification { ======= ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= +>>>>>>> locationtech-main val data = Seq( """1,hello,45.0,45.0""", @@ -154,6 +158,7 @@ class DelimitedTextConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -239,6 +244,9 @@ class DelimitedTextConverterTest extends Specification { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main "be built from a conf" >> { SimpleFeatureConverter(sft, conf).close() must not(throwAn[Exception]) } @@ -259,6 +267,7 @@ class DelimitedTextConverterTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -411,12 +420,17 @@ class DelimitedTextConverterTest extends Specification { >>>>>>> 706bcb3d36 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= val hashing = Hashing.md5() res(0).getID mustEqual hashing.hashBytes("1,hello,45.0,45.0".getBytes(StandardCharsets.UTF_8)).toString res(1).getID mustEqual hashing.hashBytes("2,world,90.0,90.0".getBytes(StandardCharsets.UTF_8)).toString >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main } "handle tab delimited files" >> { diff --git a/geomesa-convert/geomesa-convert-xml/pom.xml b/geomesa-convert/geomesa-convert-xml/pom.xml index c58c0d103064..13291cbedbe6 100644 --- a/geomesa-convert/geomesa-convert-xml/pom.xml +++ b/geomesa-convert/geomesa-convert-xml/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XmlConverter.scala b/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XmlConverter.scala index e0e2f97e6e92..ef0910737a66 100644 --- a/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XmlConverter.scala +++ b/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XmlConverter.scala @@ -68,6 +68,7 @@ class XmlConverter(sft: SimpleFeatureType, config: XmlConfig, fields: Seq[XmlFie <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c83e8187d (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -862,6 +863,15 @@ class XmlConverter(sft: SimpleFeatureType, config: XmlConfig, fields: Seq[XmlFie val array = Array.ofDim[Any](2) >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= + val array = Array.ofDim[Any](2) +======= + val array = Array.ofDim[Any](1) +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +======= + val array = Array.ofDim[Any](2) +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main helper.get.rootPath match { case None => @@ -974,6 +984,7 @@ object XmlConverter extends StrictLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= private val mutableArray = Array.ofDim[Any](1) @@ -1069,6 +1080,11 @@ object XmlConverter extends StrictLogging { private val mutableArray = Array.ofDim[Any](1) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + private val mutableArray = Array.ofDim[Any](1) + +>>>>>>> locationtech-main private val expression = new ThreadLocal[XPathExpression]() { override def initialValue(): XPathExpression = helper.get.xpath.compile(path) } @@ -1080,6 +1096,7 @@ object XmlConverter extends StrictLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1129,6 +1146,8 @@ object XmlConverter extends StrictLogging { >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main override def eval(args: Array[Any])(implicit ec: EvaluationContext): Any = { mutableArray(0) = expression.get.evaluate(args(0)) super.eval(mutableArray) @@ -1137,6 +1156,7 @@ object XmlConverter extends StrictLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= <<<<<<< HEAD @@ -1228,6 +1248,9 @@ object XmlConverter extends StrictLogging { ======= >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main private def values(args: Array[AnyRef]): AnyRef = expression.get.evaluate(args(0)) } diff --git a/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XmlFunctionFactory.scala b/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XmlFunctionFactory.scala index 12297470b0a3..6b66d055ba4c 100644 --- a/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XmlFunctionFactory.scala +++ b/geomesa-convert/geomesa-convert-xml/src/main/scala/org/locationtech/geomesa/convert/xml/XmlFunctionFactory.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.convert.xml <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -165,11 +166,16 @@ import java.util.concurrent.TimeUnit >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import java.io.StringWriter import java.util.concurrent.TimeUnit >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main import com.typesafe.config.ConfigFactory import org.locationtech.geomesa.convert2.transforms.TransformerFunction.NamedTransformerFunction import org.locationtech.geomesa.convert2.transforms.{TransformerFunction, TransformerFunctionFactory} @@ -186,6 +192,7 @@ import javax.xml.xpath.XPathExpression <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -245,6 +252,8 @@ import javax.xml.xpath.XPathExpression >>>>>>> locationtech-main ======= >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main import scala.concurrent.duration.Duration ======= import org.locationtech.geomesa.convert2.transforms.TransformerFunction.NamedTransformerFunction @@ -254,6 +263,7 @@ import org.w3c.dom.Element <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -351,6 +361,10 @@ import org.w3c.dom.Element >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) + +>>>>>>> locationtech-main import scala.concurrent.duration.Duration class XmlFunctionFactory extends TransformerFunctionFactory { diff --git a/geomesa-convert/pom.xml b/geomesa-convert/pom.xml index 2b0e4a41b84d..2eb5ed6fcf75 100644 --- a/geomesa-convert/pom.xml +++ b/geomesa-convert/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-features/geomesa-feature-all/pom.xml b/geomesa-features/geomesa-feature-all/pom.xml index 10d5d92aa7b6..d496e8579352 100644 --- a/geomesa-features/geomesa-feature-all/pom.xml +++ b/geomesa-features/geomesa-feature-all/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-features/geomesa-feature-avro/pom.xml b/geomesa-features/geomesa-feature-avro/pom.xml index 70713144b5a0..8eb7757e846f 100644 --- a/geomesa-features/geomesa-feature-avro/pom.xml +++ b/geomesa-features/geomesa-feature-avro/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-features/geomesa-feature-common/pom.xml b/geomesa-features/geomesa-feature-common/pom.xml index 48635bd35c17..853122a48626 100644 --- a/geomesa-features/geomesa-feature-common/pom.xml +++ b/geomesa-features/geomesa-feature-common/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/SerializationOption.scala b/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/SerializationOption.scala index 65d6da9f263a..f97c2415412c 100644 --- a/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/SerializationOption.scala +++ b/geomesa-features/geomesa-feature-common/src/main/scala/org/locationtech/geomesa/features/SerializationOption.scala @@ -25,6 +25,7 @@ object SerializationOption extends Enumeration { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -86,6 +87,9 @@ object SerializationOption extends Enumeration { ======= ======= >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> locationtech-main val WithUserData :Value = Value val WithoutFidHints :Value = Value val WithoutId :Value = Value @@ -94,6 +98,7 @@ object SerializationOption extends Enumeration { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -185,6 +190,9 @@ object SerializationOption extends Enumeration { ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main implicit class SerializationOptions(val options: Set[SerializationOption]) extends AnyVal { diff --git a/geomesa-features/geomesa-feature-kryo/pom.xml b/geomesa-features/geomesa-feature-kryo/pom.xml index 7f90e55442d6..6c9b9126b135 100644 --- a/geomesa-features/geomesa-feature-kryo/pom.xml +++ b/geomesa-features/geomesa-feature-kryo/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/serialization/KryoUserDataSerialization.scala b/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/serialization/KryoUserDataSerialization.scala index ce89bca1f918..850dd6bc3198 100644 --- a/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/serialization/KryoUserDataSerialization.scala +++ b/geomesa-features/geomesa-feature-kryo/src/main/scala/org/locationtech/geomesa/features/kryo/serialization/KryoUserDataSerialization.scala @@ -66,6 +66,7 @@ object KryoUserDataSerialization extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -487,6 +488,10 @@ object KryoUserDataSerialization extends LazyLogging { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main serialize(out, javaMap, withoutFidHints = false, writeAscii = false) def serialize(out: Output, javaMap: java.util.Map[_ <: AnyRef, _ <: AnyRef], withoutFidHints: Boolean): Unit = @@ -513,6 +518,7 @@ object KryoUserDataSerialization extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c6103aab4 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -1210,17 +1216,24 @@ object KryoUserDataSerialization extends LazyLogging { ======= ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ======= serialize(out, javaMap, withoutFidHints = false) def serialize(out: Output, javaMap: java.util.Map[_ <: AnyRef, _ <: AnyRef], withoutFidHints: Boolean): Unit = { >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main import scala.collection.JavaConverters._ // write in sorted order to keep consistent output diff --git a/geomesa-features/geomesa-feature-kryo/src/test/scala/org/locationtech/geomesa/features/kryo/KryoGeometrySerializerTest.scala b/geomesa-features/geomesa-feature-kryo/src/test/scala/org/locationtech/geomesa/features/kryo/KryoGeometrySerializerTest.scala index 127208b3118c..d7667eefa484 100644 --- a/geomesa-features/geomesa-feature-kryo/src/test/scala/org/locationtech/geomesa/features/kryo/KryoGeometrySerializerTest.scala +++ b/geomesa-features/geomesa-feature-kryo/src/test/scala/org/locationtech/geomesa/features/kryo/KryoGeometrySerializerTest.scala @@ -16,6 +16,7 @@ import org.locationtech.geomesa.features.serialization.{GeometryLengthThreshold, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -135,6 +136,11 @@ import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemPropert import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +import org.locationtech.geomesa.utils.conf.GeoMesaSystemProperties.SystemProperty +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.text.WKTUtils import org.locationtech.jts.geom.{Coordinate, Geometry} import org.specs2.matcher.MatchResult diff --git a/geomesa-features/geomesa-feature-nio/pom.xml b/geomesa-features/geomesa-feature-nio/pom.xml index c9c9d8697feb..561cf3e4e125 100644 --- a/geomesa-features/geomesa-feature-nio/pom.xml +++ b/geomesa-features/geomesa-feature-nio/pom.xml @@ -99,6 +99,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -113,6 +114,8 @@ ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) @@ -126,6 +129,7 @@ <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -1613,6 +1617,8 @@ >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5f17de37ee (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -1621,6 +1627,7 @@ >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a10782e91 ([maven-release-plugin] prepare for next development iteration) >>>>>>> c3f87e58ce ([maven-release-plugin] prepare for next development iteration) ======= @@ -2094,6 +2101,8 @@ ======= >>>>>>> 1261eeea04 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2102,6 +2111,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2268,6 +2278,10 @@ >>>>>>> 24218aa338 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) @@ -2279,6 +2293,7 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2352,9 +2367,12 @@ ======= >>>>>>> 7b5119937 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= <<<<<<< HEAD @@ -2389,6 +2407,8 @@ >>>>>>> 2c62d0c202 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2397,6 +2417,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2435,12 +2456,16 @@ ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2456,18 +2481,25 @@ >>>>>>> f10f13ac29 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ac4540264d ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -2518,10 +2550,23 @@ ======= ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5439,6 +5484,10 @@ ======= >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -5532,6 +5581,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6674,10 +6724,13 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 2c62d0c202 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6926,12 +6979,18 @@ >>>>>>> locationtech-main ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7724,6 +7783,10 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -7733,6 +7796,7 @@ ======= >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -8200,6 +8264,8 @@ >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) ======= @@ -8218,6 +8284,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -8287,6 +8354,8 @@ ======= <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD @@ -8295,6 +8364,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -8317,6 +8387,8 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -8328,6 +8400,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4ce91569f ([maven-release-plugin] prepare for next development iteration) ======= @@ -8361,6 +8434,10 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -8375,6 +8452,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 24df6d87c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> e0cdfec1d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -9072,12 +9150,15 @@ >>>>>>> locationtech-main ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -9212,6 +9293,11 @@ >>>>>>> 8d80a87f7e ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> locationtech-main +======= +======= +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -9230,6 +9316,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -9941,11 +10028,27 @@ >>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -12240,6 +12343,8 @@ ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= 3.4.0-SNAPSHOT @@ -12247,6 +12352,7 @@ >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> b4fa84b8df (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> ac4540264 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -12309,10 +12415,21 @@ ======= ======= ======= +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +>>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> e1a25e898 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> aa48bd9dd1 ([maven-release-plugin] prepare for next development iteration) @@ -12324,6 +12441,8 @@ ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) ======= @@ -12334,6 +12453,7 @@ <<<<<<< HEAD >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0df4ab56d (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> cdc7c0fe7f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12346,6 +12466,8 @@ ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= 3.4.0-SNAPSHOT @@ -12354,6 +12476,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 78d1db9c2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 8ae6289bbe ([maven-release-plugin] prepare for next development iteration) @@ -12835,6 +12958,11 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-features/pom.xml b/geomesa-features/pom.xml index f720123845b4..628fb8ad8d07 100644 --- a/geomesa-features/pom.xml +++ b/geomesa-features/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-filter/pom.xml b/geomesa-filter/pom.xml index a2f93b2076ff..2a0d8a44b7bd 100644 --- a/geomesa-filter/pom.xml +++ b/geomesa-filter/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/FilterHelper.scala b/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/FilterHelper.scala index 450e491cc888..96817d1ac90f 100644 --- a/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/FilterHelper.scala +++ b/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/FilterHelper.scala @@ -204,6 +204,7 @@ object FilterHelper { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= o.getChildren.map(f => >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -323,6 +324,11 @@ object FilterHelper { o.getChildren.map(f => >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= + o.getChildren.map(f => +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main extractAttributeBounds(f, attribute, binding) ).reduceLeft[FilterValues[Bounds[T]]]((acc, child) => { if (acc.isEmpty || child.isEmpty) { @@ -662,6 +668,7 @@ object FilterHelper { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= andFilters(orOption(simplified).toSeq ++ duplicates) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -781,6 +788,11 @@ object FilterHelper { andFilters(orOption(simplified).toSeq ++ duplicates) >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + andFilters(orOption(simplified).toSeq ++ duplicates) +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main } } diff --git a/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/package.scala b/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/package.scala index bb18050319e7..0fefc61cd9fb 100644 --- a/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/package.scala +++ b/geomesa-filter/src/main/scala/org/locationtech/geomesa/filter/package.scala @@ -444,6 +444,7 @@ package object filter { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= f.getParameters.map(DataUtilities.attributeNames(_).headOption).collectFirst { case Some(p) => p } >>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) @@ -563,4 +564,9 @@ package object filter { f.getParameters.map(DataUtilities.attributeNames(_).headOption).collectFirst { case Some(p) => p } >>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) >>>>>>> b540b71fce (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +======= +======= + f.getParameters.map(DataUtilities.attributeNames(_).headOption).collectFirst { case Some(p) => p } +>>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +>>>>>>> locationtech-main } diff --git a/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/FilterHelperTest.scala b/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/FilterHelperTest.scala index a9fee686224a..c49cffaab74e 100644 --- a/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/FilterHelperTest.scala +++ b/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/FilterHelperTest.scala @@ -328,6 +328,7 @@ class FilterHelperTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -749,6 +750,10 @@ class FilterHelperTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "remove interleaving bounds for AND filter" >> { var cql = "S < 3 AND S < 2 AND S < 4" var bounds = FilterHelper.extractAttributeBounds(ECQL.toFilter(cql), "S", classOf[Integer]) @@ -812,6 +817,7 @@ class FilterHelperTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e8cc4971c6 (Merge branch 'feature/postgis-fixes') ======= @@ -1058,9 +1064,12 @@ class FilterHelperTest extends Specification { >>>>>>> 4623d9a687 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -1377,6 +1386,8 @@ class FilterHelperTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main "deduplicate OR filters" >> { val filters = Seq( ("(a > 1 AND b < 2 AND c = 3) OR (c = 3 AND a > 2 AND b < 2) OR (b < 2 AND a > 3 AND c = 3)", diff --git a/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/factory/FastFilterFactoryTest.scala b/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/factory/FastFilterFactoryTest.scala index f853b1d5a588..0a362177b1f8 100644 --- a/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/factory/FastFilterFactoryTest.scala +++ b/geomesa-filter/src/test/scala/org/locationtech/geomesa/filter/factory/FastFilterFactoryTest.scala @@ -20,6 +20,7 @@ import org.locationtech.geomesa.utils.geotools.SimpleFeatureTypes <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.opengis.filter.PropertyIsEqualTo >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -139,6 +140,11 @@ import org.opengis.filter.PropertyIsEqualTo import org.opengis.filter.PropertyIsEqualTo >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +import org.opengis.filter.PropertyIsEqualTo +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main import org.opengis.filter.expression.Literal import org.opengis.filter.spatial.BBOX import org.specs2.execute.Result @@ -267,6 +273,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -784,11 +791,14 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> a63cb7e74 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 24c4df93a5 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= @@ -1171,6 +1181,8 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> a35efac12e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> f36b0e8b9 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) @@ -1188,6 +1200,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9943e05ec9 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= @@ -1749,10 +1762,16 @@ class FastFilterFactoryTest extends Specification { >>>>>>> 84b8b0ecd2 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= ======= +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main +======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f302a54949 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -2987,11 +3006,16 @@ class FastFilterFactoryTest extends Specification { >>>>>>> 0833709340 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> e3a63fee1 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +>>>>>>> locationtech-main +======= +======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76618c8da3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 694bcd3776 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3028,11 +3052,20 @@ class FastFilterFactoryTest extends Specification { >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> a63cb7e74 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 908ad4071 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +>>>>>>> locationtech-main +======= +======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 97ec7d864a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 1973f72e77 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -3475,6 +3508,10 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "handle logical erasure of entire clauses" >> { val sft = SimpleFeatureTypes.createType("test", "a:Integer") val ecql = "(a = 0 AND a = 0) OR (a = 0 AND a = 1) OR (a = 0 AND a = 2)" @@ -3538,6 +3575,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 45ad5d11f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4314,6 +4352,13 @@ class FastFilterFactoryTest extends Specification { >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> a63cb7e74 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= ======= @@ -4330,6 +4375,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -4457,6 +4503,10 @@ class FastFilterFactoryTest extends Specification { >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -4486,6 +4536,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dace2085b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -4546,11 +4597,14 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= >>>>>>> a63cb7e74 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6722,12 +6776,15 @@ class FastFilterFactoryTest extends Specification { >>>>>>> 5f807ff388 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +======= +>>>>>>> locationtech-main >>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) >>>>>>> f36b0e8b9 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a63cb7e740 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) <<<<<<< HEAD >>>>>>> a9884ff1f6 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) @@ -6774,10 +6831,15 @@ class FastFilterFactoryTest extends Specification { >>>>>>> c51978d78f (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= ======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) >>>>>>> e3a63fee1 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3333975e77 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) <<<<<<< HEAD >>>>>>> 9412e85b59 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) @@ -6804,20 +6866,30 @@ class FastFilterFactoryTest extends Specification { >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> a63cb7e74 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8a325e13c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 6cd1151639 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) >>>>>>> 908ad4071 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9638dc731e (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) <<<<<<< HEAD >>>>>>> 1e00950a90 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) @@ -7279,6 +7351,12 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "create filter containing functions with embedded expressions" >> { val sft = SimpleFeatureTypes.createType("test", "f0:Integer,f1:Integer") val ecql = "min(f0 + 2, 4) < min(f1, 5)" @@ -7339,6 +7417,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -7457,11 +7536,17 @@ class FastFilterFactoryTest extends Specification { >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main >>>>>>> f36b0e8b9 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -7517,11 +7602,17 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 84b8b0ecd2 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= +>>>>>>> e3a63fee1 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= >>>>>>> f36b0e8b9 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) >>>>>>> a63cb7e74 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -7675,12 +7766,15 @@ class FastFilterFactoryTest extends Specification { >>>>>>> 25063957fc (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 908ad4071 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main Result.foreach(1 to 10) { j => ======= @@ -10181,6 +10275,11 @@ class FastFilterFactoryTest extends Specification { Result.foreach(1 to 10) { j => ======= Result.foreach(1 to 10){ j => +======= + Result.foreach(1 to 10) { j => +======= + Result.foreach(1 to 10){ j => +>>>>>>> locationtech-main >>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) <<<<<<< HEAD <<<<<<< HEAD @@ -10192,6 +10291,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10375,11 +10475,14 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> a63cb7e74 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 24c4df93a5 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= @@ -10743,6 +10846,8 @@ class FastFilterFactoryTest extends Specification { >>>>>>> fe3de10f11 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> a35efac12e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main Result.foreach(1 to 10) { j => >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10762,6 +10867,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9943e05ec9 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= @@ -11353,12 +11459,18 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 84b8b0ecd2 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= +======= +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main ======= Result.foreach(1 to 10) { j => >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f302a54949 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -12642,6 +12754,10 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 0833709340 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> e3a63fee1 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +>>>>>>> locationtech-main +======= ======= Result.foreach(1 to 10) { j => >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -12649,6 +12765,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 76618c8da3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 694bcd3776 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -12684,6 +12801,14 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> a63cb7e74 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 908ad4071 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) +>>>>>>> locationtech-main +======= ======= Result.foreach(1 to 10) { j => >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -12691,6 +12816,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 97ec7d864a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 1973f72e77 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -13155,6 +13281,11 @@ class FastFilterFactoryTest extends Specification { Result.foreach(1 to 10) { j => >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= + Result.foreach(1 to 10) { j => +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main val sf = ScalaSimpleFeature.create(sft, s"${i}_${j}", i, j) filterGeoMesa.evaluate(sf) mustEqual filterGeoTools.evaluate(sf) } @@ -13172,6 +13303,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13436,6 +13568,10 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "comparison operators should have consistent semantics" >> { val sft = SimpleFeatureTypes.createType("test", "s:String") val sf = ScalaSimpleFeature.create(sft, "id", "5") @@ -13455,6 +13591,7 @@ class FastFilterFactoryTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') ======= @@ -13632,9 +13769,12 @@ class FastFilterFactoryTest extends Specification { >>>>>>> 7bb5f26c3e (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 7acc3ea46 (GEOMESA-3067 Find attribute in Filters with Functions with embedded expressions correctly) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -13822,5 +13962,7 @@ class FastFilterFactoryTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main } } diff --git a/geomesa-fs/geomesa-fs-datastore/pom.xml b/geomesa-fs/geomesa-fs-datastore/pom.xml index dbdc0389fe17..6729daf8e550 100644 --- a/geomesa-fs/geomesa-fs-datastore/pom.xml +++ b/geomesa-fs/geomesa-fs-datastore/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-dist/pom.xml b/geomesa-fs/geomesa-fs-dist/pom.xml index 937712a614b6..288cdb7fca38 100644 --- a/geomesa-fs/geomesa-fs-dist/pom.xml +++ b/geomesa-fs/geomesa-fs-dist/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml index 480f2d41a1ce..110a7d3aa3a1 100644 --- a/geomesa-fs/geomesa-fs-gs-plugin/pom.xml +++ b/geomesa-fs/geomesa-fs-gs-plugin/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml index c8d91d74ff82..0d552bc977e8 100644 --- a/geomesa-fs/geomesa-fs-spark-runtime/pom.xml +++ b/geomesa-fs/geomesa-fs-spark-runtime/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 @@ -11370,6 +11436,13 @@ compile + + + com.google.guava + guava + compile + + org.apache.commons diff --git a/geomesa-fs/geomesa-fs-spark/pom.xml b/geomesa-fs/geomesa-fs-spark/pom.xml index 1ba209d77525..1f415ffae90e 100644 --- a/geomesa-fs/geomesa-fs-spark/pom.xml +++ b/geomesa-fs/geomesa-fs-spark/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml index 65eaddb7b87e..325372682956 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-api/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml index 7439e18ce01f..4cf3f7f27e59 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/metadata/MetadataJson.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/metadata/MetadataJson.scala index 297ba74349d3..be66752ff8a9 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/metadata/MetadataJson.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/metadata/MetadataJson.scala @@ -106,6 +106,7 @@ object MetadataJson extends MethodProfiling { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -172,6 +173,8 @@ object MetadataJson extends MethodProfiling { >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main ======= pureconfig.loadConfigOrThrow[NamedOptions]( ConfigFactory.load(ConfigFactory.parseString(interpolated, ParseOptions))) @@ -179,6 +182,7 @@ object MetadataJson extends MethodProfiling { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -240,6 +244,8 @@ object MetadataJson extends MethodProfiling { >>>>>>> locationtech-main ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main } cache.put(context.root.toUri.toString, toCache) PathCache.register(context.fc, file) diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/utils/PartitionSchemeArgResolver.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/utils/PartitionSchemeArgResolver.scala index f93fd262d135..e87b195ca2be 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/utils/PartitionSchemeArgResolver.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/main/scala/org/locationtech/geomesa/fs/storage/common/utils/PartitionSchemeArgResolver.scala @@ -17,6 +17,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -24,6 +27,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -434,6 +438,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -441,6 +447,7 @@ <<<<<<< HEAD >>>>>>> 120815d0b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b54485f5a2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -455,12 +462,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -809,6 +819,8 @@ >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -821,13 +833,17 @@ package org.locationtech.geomesa.fs.storage.common.utils <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= import java.nio.charset.StandardCharsets >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -946,6 +962,8 @@ import java.nio.charset.StandardCharsets >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import org.apache.commons.io.IOUtils import org.locationtech.geomesa.fs.storage.api.{NamedOptions, PartitionSchemeFactory} import org.locationtech.geomesa.fs.storage.common.StorageSerialization @@ -959,6 +977,7 @@ import java.nio.charset.StandardCharsets <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -1071,6 +1090,10 @@ import java.nio.charset.StandardCharsets ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import scala.util.control.NonFatal object PartitionSchemeArgResolver { diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/test/scala/org/locationtech/geomesa/fs/storage/common/metadata/MetadataJsonTest.scala b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/test/scala/org/locationtech/geomesa/fs/storage/common/metadata/MetadataJsonTest.scala index c0afadbdc0a6..1714a3667f1e 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/test/scala/org/locationtech/geomesa/fs/storage/common/metadata/MetadataJsonTest.scala +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-common/src/test/scala/org/locationtech/geomesa/fs/storage/common/metadata/MetadataJsonTest.scala @@ -54,6 +54,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -740,12 +741,18 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= + * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. +======= +<<<<<<< HEAD +>>>>>>> locationtech-main ======= ======= >>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -753,6 +760,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 76618c8da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -766,6 +775,7 @@ >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD @@ -1265,6 +1275,8 @@ >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1294,6 +1306,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1328,11 +1341,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> c5e182765 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1352,6 +1369,8 @@ >>>>>>> c3c5dd0ebb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -1368,6 +1387,7 @@ <<<<<<< HEAD >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 338d952d43 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -1406,9 +1426,12 @@ <<<<<<< HEAD >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 23c0241798 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1424,12 +1447,18 @@ >>>>>>> 76618c8da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +>>>>>>> 76618c8da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a910ae135f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 92674ff9d4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1450,11 +1479,16 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> c8a325e13 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -1463,6 +1497,7 @@ >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +<<<<<<< HEAD >>>>>>> 2586fa6a40 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> c8a325e13 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -1516,6 +1551,10 @@ >>>>>>> 2654d9c120 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> b9c0fc77b9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= @@ -1531,6 +1570,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1801,6 +1841,8 @@ >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> d9ed077cd (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -1832,6 +1874,7 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -1913,6 +1956,8 @@ >>>>>>> c9c24ca3d7 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> b1c506839 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1924,6 +1969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5e182765 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -1971,19 +2017,32 @@ <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> c5e182765 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> 9d708b240 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> c8a325e13 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -1992,6 +2051,8 @@ ======= >>>>>>> 9a4dff9e4f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2000,6 +2061,7 @@ >>>>>>> 5f428db97 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 23c0241798 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2010,6 +2072,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -2018,6 +2082,7 @@ >>>>>>> 76618c8da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a910ae135f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2028,10 +2093,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD ======= @@ -2047,6 +2115,9 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 89bdd3013 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2055,6 +2126,7 @@ >>>>>>> c8a325e13 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ad3cedc4db (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2065,12 +2137,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 72bafaf54 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d4c5768cfa (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2081,12 +2156,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 97ec7d864 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bdbced26d4 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -2097,6 +2175,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') @@ -2104,6 +2184,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= @@ -5973,6 +6054,8 @@ >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -5985,6 +6068,7 @@ package org.locationtech.geomesa.fs.storage.common.metadata <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6046,6 +6130,9 @@ package org.locationtech.geomesa.fs.storage.common.metadata ======= ======= >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> locationtech-main import java.io.File import java.nio.charset.StandardCharsets import java.nio.file.Files @@ -6053,6 +6140,7 @@ import java.nio.file.Files <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -6144,6 +6232,9 @@ import java.nio.file.Files ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main import org.apache.commons.io.{FileUtils, IOUtils} import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileContext, Path} @@ -6162,6 +6253,7 @@ import java.nio.file.Files <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -6274,6 +6366,10 @@ import java.nio.file.Files ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main @RunWith(classOf[JUnitRunner]) class MetadataJsonTest extends Specification { @@ -6408,6 +6504,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -10204,6 +10301,12 @@ class MetadataJsonTest extends Specification { >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 65ba54511b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -10234,6 +10337,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8f88e57edc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 07a6a5c291 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11853,6 +11957,10 @@ class MetadataJsonTest extends Specification { >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -11880,6 +11988,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 947a867d1c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -11935,6 +12044,12 @@ class MetadataJsonTest extends Specification { >>>>>>> e6e1f4bdd5 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD @@ -11942,6 +12057,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1562748d0b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 10910a4865 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -12202,6 +12318,8 @@ class MetadataJsonTest extends Specification { ======= ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -12209,6 +12327,7 @@ class MetadataJsonTest extends Specification { >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -13329,12 +13448,24 @@ class MetadataJsonTest extends Specification { >>>>>>> c558052945 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 941104fee (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 13fc760651 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -13413,6 +13544,12 @@ class MetadataJsonTest extends Specification { >>>>>>> cec40638c2 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -13420,6 +13557,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ad3cedc4d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9abc630fdf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -13498,6 +13636,12 @@ class MetadataJsonTest extends Specification { >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -13505,6 +13649,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 364812dd7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> f038e6d420 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -13608,6 +13753,14 @@ class MetadataJsonTest extends Specification { >>>>>>> c37a34dcb9 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD @@ -13616,6 +13769,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14072,6 +14226,8 @@ class MetadataJsonTest extends Specification { ======= >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -14079,6 +14235,7 @@ class MetadataJsonTest extends Specification { >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0df4ab56df (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 856bf16b3e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -14466,6 +14623,10 @@ class MetadataJsonTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "MetadataJson" should { "persist and replace system properties (and environment variables)" in { @@ -14523,6 +14684,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 5f807ff388 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -14543,6 +14705,10 @@ class MetadataJsonTest extends Specification { >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -14560,6 +14726,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 49a5a0454f (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -15352,6 +15519,8 @@ class MetadataJsonTest extends Specification { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15369,6 +15538,7 @@ class MetadataJsonTest extends Specification { >>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 87bf55340 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> e847488d8 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -15685,6 +15855,8 @@ class MetadataJsonTest extends Specification { >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 498d1c9c26 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> locationtech-main val schemeOptions = "MetadataJson" should { @@ -15697,6 +15869,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -17569,6 +17742,8 @@ class MetadataJsonTest extends Specification { >>>>>>> 810876750d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b9bdd406e3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> locationtech-main >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -17611,6 +17786,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1cdce777e4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 02eb35f232 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -17662,9 +17838,22 @@ class MetadataJsonTest extends Specification { >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +<<<<<<< HEAD >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afcc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -17747,6 +17936,9 @@ class MetadataJsonTest extends Specification { >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628dba (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= >>>>>>> f71fa3c0e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -17768,6 +17960,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -18004,6 +18197,10 @@ class MetadataJsonTest extends Specification { ======= >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -18028,6 +18225,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -19227,11 +19425,16 @@ class MetadataJsonTest extends Specification { ======= >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1261eeea04 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -19254,10 +19457,20 @@ class MetadataJsonTest extends Specification { >>>>>>> 32234db855 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -19270,15 +19483,27 @@ class MetadataJsonTest extends Specification { ======= ======= ======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 86dd18aa73 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= ======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main "MetadataJson" should { "persist and replace system properties (and environment variables)" in { @@ -19379,6 +19604,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -21463,6 +21689,12 @@ class MetadataJsonTest extends Specification { >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 1261eeea04 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -21490,6 +21722,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9a1ca2afcc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 3be8d2a5a4 (Merge branch 'feature/postgis-fixes') @@ -22638,6 +22871,10 @@ class MetadataJsonTest extends Specification { >>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> b03141c1bb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -22656,6 +22893,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e847488d8 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD @@ -22940,9 +23178,16 @@ class MetadataJsonTest extends Specification { ======= <<<<<<< HEAD ======= +======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -23178,6 +23423,8 @@ class MetadataJsonTest extends Specification { ======= <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= >>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= @@ -23185,6 +23432,7 @@ class MetadataJsonTest extends Specification { >>>>>>> 7e68948ac (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c7ab001481 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -23812,11 +24060,23 @@ class MetadataJsonTest extends Specification { >>>>>>> c558052945 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 6eb31fb65 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +<<<<<<< HEAD +======= +>>>>>>> 0e68e9f4c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 4073c9b17 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 941104fee (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 13fc760651 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -23891,11 +24151,18 @@ class MetadataJsonTest extends Specification { >>>>>>> f302a54949 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 07a6a5c29 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> cdb410251 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 67b361c85 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ad3cedc4d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 9abc630fdf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -23970,11 +24237,18 @@ class MetadataJsonTest extends Specification { >>>>>>> 5f17de37ee (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> d6616d893 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 364812dd7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> f038e6d420 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -24073,11 +24347,20 @@ class MetadataJsonTest extends Specification { >>>>>>> 60b2734c49 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> 28e2bfa2d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> b4320946b (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 314e6ef1a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 243797ba3 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD >>>>>>> 783589ab9d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -30117,6 +30400,8 @@ class MetadataJsonTest extends Specification { ======= >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> a9f01eaaf (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -30126,6 +30411,7 @@ class MetadataJsonTest extends Specification { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0df4ab56d (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> cdc7c0fe7f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -30805,6 +31091,10 @@ class MetadataJsonTest extends Specification { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main withPath { context => val prop = "MetadataJsonTest.foo" val interpolated = "${" + prop + "}" diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml index f656e39d74bb..a92a203f80ef 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-convert/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml index d4c8d03b2f2b..54d4d0f2be17 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-orc/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml index 4b90a97f0d31..6948ff64aba5 100644 --- a/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-parquet/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-storage/pom.xml b/geomesa-fs/geomesa-fs-storage/pom.xml index 2c9982b2e1de..9b30d54a28f0 100644 --- a/geomesa-fs/geomesa-fs-storage/pom.xml +++ b/geomesa-fs/geomesa-fs-storage/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-tools/pom.xml b/geomesa-fs/geomesa-fs-tools/pom.xml index f486a83d20ad..de399a583d2c 100644 --- a/geomesa-fs/geomesa-fs-tools/pom.xml +++ b/geomesa-fs/geomesa-fs-tools/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/FsCompactCommand.scala b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/FsCompactCommand.scala index 41fd194360dd..27209c89a1e6 100644 --- a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/FsCompactCommand.scala +++ b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/compact/FsCompactCommand.scala @@ -29,6 +29,7 @@ import org.locationtech.geomesa.tools.utils.TerminalCallback.PrintProgress <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.geomesa.tools._ >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -148,6 +149,11 @@ import org.locationtech.geomesa.tools._ import org.locationtech.geomesa.tools._ >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +import org.locationtech.geomesa.tools._ +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.io.PathUtils import org.locationtech.geomesa.utils.text.TextTools @@ -246,6 +252,7 @@ object FsCompactCommand { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= job.run(storage, toCompact, fileSize, tempDir, libjarsFiles, libjarsPaths, status) match { >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -365,6 +372,11 @@ object FsCompactCommand { job.run(storage, toCompact, fileSize, tempDir, libjarsFiles, libjarsPaths, status) match { >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= + job.run(storage, toCompact, fileSize, tempDir, libjarsFiles, libjarsPaths, status) match { +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main case JobSuccess(message, counts) => Command.user.info(s"Distributed compaction complete in ${TextTools.getTime(start)}") val success = counts(FileSystemCompactionJob.MappedCounter) diff --git a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FileSystemConverterJob.scala b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FileSystemConverterJob.scala index 17fd453ce48e..3f6271f29466 100644 --- a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FileSystemConverterJob.scala +++ b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FileSystemConverterJob.scala @@ -31,6 +31,7 @@ import org.locationtech.geomesa.fs.storage.parquet.jobs.ParquetStorageConfigurat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -89,12 +90,15 @@ import org.locationtech.geomesa.index.geotools.GeoMesaFeatureWriter ======= >>>>>>> d805b562c5 (GEOMESA-3095 Generate random feature IDs when id-field is not specified in converter spec) ======= +>>>>>>> locationtech-main +======= import org.locationtech.geomesa.parquet.jobs.ParquetStorageConfiguration import org.locationtech.geomesa.index.geotools.GeoMesaFeatureWriter >>>>>>> 918f17f85 (GEOMESA-3095 Generate random feature IDs when id-field is not specified in converter spec) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -150,6 +154,8 @@ import org.locationtech.geomesa.index.geotools.GeoMesaFeatureWriter >>>>>>> locationtech-main ======= >>>>>>> d805b562c5 (GEOMESA-3095 Generate random feature IDs when id-field is not specified in converter spec) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.tools.Command import org.locationtech.geomesa.tools.ingest.ConverterIngestJob import org.locationtech.geomesa.tools.ingest.IngestCommand.IngestCounters diff --git a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FsIngestCommand.scala b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FsIngestCommand.scala index 900a60feab26..e69f4e62b6c1 100644 --- a/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FsIngestCommand.scala +++ b/geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FsIngestCommand.scala @@ -27,13 +27,17 @@ import org.locationtech.geomesa.jobs.mapreduce.ConverterCombineInputFormat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= import org.locationtech.geomesa.parquet.ParquetFileSystemStorage import org.locationtech.geomesa.tools.{Command, TempPathParam} >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -152,6 +156,8 @@ import org.locationtech.geomesa.tools.{Command, TempPathParam} >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.tools.DistributedRunParam.RunModes import org.locationtech.geomesa.tools.DistributedRunParam.RunModes.RunMode import org.locationtech.geomesa.tools.ingest.IngestCommand.{IngestParams, Inputs} diff --git a/geomesa-fs/pom.xml b/geomesa-fs/pom.xml index e39440f876d1..1504b39ed83b 100644 --- a/geomesa-fs/pom.xml +++ b/geomesa-fs/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-api/pom.xml b/geomesa-geojson/geomesa-geojson-api/pom.xml index fe7609cb4c40..d058cd865ceb 100644 --- a/geomesa-geojson/geomesa-geojson-api/pom.xml +++ b/geomesa-geojson/geomesa-geojson-api/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml index ceedc5d4aa06..bea7563cf42e 100644 --- a/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml +++ b/geomesa-geojson/geomesa-geojson-gs-plugin/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml 4.0.0 diff --git a/geomesa-geojson/geomesa-geojson-rest/pom.xml b/geomesa-geojson/geomesa-geojson-rest/pom.xml index 72f072ceb3f5..9e86eb30a10a 100644 --- a/geomesa-geojson/geomesa-geojson-rest/pom.xml +++ b/geomesa-geojson/geomesa-geojson-rest/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-geojson/pom.xml b/geomesa-geojson/pom.xml index 95d73603477a..684d92bcdedb 100644 --- a/geomesa-geojson/pom.xml +++ b/geomesa-geojson/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-gt/geomesa-gt-dist/pom.xml b/geomesa-gt/geomesa-gt-dist/pom.xml index 58d6617c1076..191f471a10ba 100644 --- a/geomesa-gt/geomesa-gt-dist/pom.xml +++ b/geomesa-gt/geomesa-gt-dist/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-gt/geomesa-gt-partitioning/pom.xml b/geomesa-gt/geomesa-gt-partitioning/pom.xml index 88493fc0739b..1c78f7660c47 100644 --- a/geomesa-gt/geomesa-gt-partitioning/pom.xml +++ b/geomesa-gt/geomesa-gt-partitioning/pom.xml @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -131,6 +132,15 @@ ======= 4.0.0-SNAPSHOT >>>>>>> dca5d74b69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +<<<<<<< HEAD:geomesa-gt/geomesa-gt-partitioning/pom.xml +<<<<<<< HEAD:geomesa-gt/geomesa-gt-partitioning/pom.xml + geomesa-gt_2.12 +<<<<<<< HEAD + 4.1.0-SNAPSHOT +======= + 4.0.0-SNAPSHOT +>>>>>>> locationtech-main ======= 3.3.0-SNAPSHOT >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat):geomesa-features/geomesa-feature-nio/pom.xml @@ -139,6 +149,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) ======= @@ -424,12 +435,15 @@ ======= >>>>>>> 05410a7682 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration):geomesa-features/geomesa-feature-nio/pom.xml >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 30bf8d4d94 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -546,6 +560,8 @@ >>>>>>> 06775f0442 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 05410a7682 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreFactory.scala b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreFactory.scala index 453a807251d6..b8dcd8e02eae 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreFactory.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreFactory.scala @@ -26,6 +26,7 @@ import org.geotools.jdbc.{JDBCDataStore, SQLDialect} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -339,6 +340,8 @@ import org.geotools.jdbc.{JDBCDataStore, SQLDialect} >>>>>>> d7efff9563 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgisDialect, PartitionedPostgisPsDialect} ======= import org.locationtech.geomesa.gt.partition.postgis.dialect.PartitionedPostgisDialect @@ -347,6 +350,7 @@ import org.opengis.filter.Filter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import java.sql.{Connection, DatabaseMetaData} >>>>>>> dcd872c1a (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) @@ -758,6 +762,14 @@ import java.sql.{Connection, DatabaseMetaData} import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgisDialect, PartitionedPostgisPsDialect} >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= + +import java.sql.{Connection, DatabaseMetaData} +>>>>>>> dcd872c1a (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) +======= +import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgisDialect, PartitionedPostgisPsDialect} +>>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main class PartitionedPostgisDataStoreFactory extends PostgisNGDataStoreFactory with LazyLogging { ======= @@ -775,11 +787,15 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis override protected def setupParameters(parameters: java.util.Map[String, AnyRef]): Unit = { super.setupParameters(parameters) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Seq(DbType, IdleInTransactionTimeout) ======= Seq(DbType, IdleInTransactionTimeout, PreparedStatements) >>>>>>> 008807b427 (GEOMESA-3295 Partitioned PostGIS - default to using prepared statements (#2993)) +======= + Seq(DbType, IdleInTransactionTimeout, PreparedStatements) +>>>>>>> locationtech-main .foreach(p => parameters.put(p.key, p)) } @@ -797,6 +813,7 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis source } +<<<<<<< HEAD <<<<<<< HEAD ======= // override postgis dbkey @@ -807,6 +824,8 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis override protected def createDataStoreInternal(store: JDBCDataStore, params: java.util.Map[String, _]): JDBCDataStore = { ======= +======= +>>>>>>> locationtech-main override protected def createDataStoreInternal(store: JDBCDataStore, baseParams: java.util.Map[String, _]): JDBCDataStore = { val params = new java.util.HashMap[String, Any](baseParams) // default to using prepared statements, if not specified @@ -814,8 +833,11 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis params.put(PreparedStatements.key, java.lang.Boolean.TRUE) } <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 008807b427 (GEOMESA-3295 Partitioned PostGIS - default to using prepared statements (#2993)) ======= +======= +>>>>>>> locationtech-main // set default schema, if not specified - postgis store doesn't actually use its own default if (!params.containsKey(PostgisNGDataStoreFactory.SCHEMA.key)) { // need to set it in the store, as the key has already been processed @@ -823,7 +845,10 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis // also set in the params for consistency, although it's not used anywhere params.put(PostgisNGDataStoreFactory.SCHEMA.key, "public") } +<<<<<<< HEAD >>>>>>> ed6355ceb8 (GEOMESA-3294 Partitioned PostGIS - use default database schema if not specified) +======= +>>>>>>> locationtech-main val ds = super.createDataStoreInternal(store, params) val dialect = new PartitionedPostgisDialect(ds) @@ -866,6 +891,7 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 47f8de1bb (GEOMESA-3215 Postgis - support List-type attributes) ======= @@ -1493,6 +1519,12 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis ======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= + ds.setSQLDialect(new PartitionedPostgisPsDialect(ds, dialect)) +======= +======= +>>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main ds.setSQLDialect(new PostGISPSDialect(ds, dialect) { // fix bug with PostGISPSDialect dialect not delegating these methods override def getDefaultVarcharSize: Int = dialect.getDefaultVarcharSize @@ -1516,6 +1548,7 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f31d66ef5 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) ======= @@ -2154,11 +2187,14 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis ======= ======= ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD override def getDesiredTablesType: Array[String] = dialect.getDesiredTablesType ======= >>>>>>> dcd872c1a (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) >>>>>>> f9fc40305 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) +<<<<<<< HEAD >>>>>>> 086ddfbd4a (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) }) <<<<<<< HEAD @@ -2245,6 +2281,11 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis ======= ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= + }) +<<<<<<< HEAD +>>>>>>> dcd872c1a (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) +>>>>>>> locationtech-main ======= ======= ds.setSQLDialect(new PartitionedPostgisPsDialect(ds, dialect)) @@ -2252,6 +2293,7 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 42af7673b (GEOMESA-3215 Postgis - support List-type attributes) ======= >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') @@ -2305,6 +2347,11 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgis ds.setSQLDialect(new PartitionedPostgisPsDialect(ds, dialect)) >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= + ds.setSQLDialect(new PartitionedPostgisPsDialect(ds, dialect)) +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case d => throw new IllegalArgumentException(s"Expected PostGISDialect but got: ${d.getClass.getName}") } diff --git a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisDialect.scala b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisDialect.scala index a85042320030..537707fd921c 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisDialect.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisDialect.scala @@ -24,6 +24,7 @@ import org.geotools.util.factory.Hints <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dcd872c1a (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) import org.locationtech.geomesa.gt.partition.postgis.dialect.filter.LiteralFunctionVisitor @@ -236,6 +237,9 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.filter.SplitFilterV import org.locationtech.geomesa.gt.partition.postgis.dialect.filter.SplitFilterVisitor >>>>>>> d7efff9563 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) ======= +import org.locationtech.geomesa.gt.partition.postgis.dialect.filter.SplitFilterVisitor +>>>>>>> locationtech-main +======= ======= >>>>>>> dcd872c1a (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) import org.locationtech.geomesa.gt.partition.postgis.dialect.filter.LiteralFunctionVisitor @@ -243,6 +247,7 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.filter.LiteralFunct <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> f5b2148366 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) @@ -304,6 +309,8 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.filter.LiteralFunct >>>>>>> locationtech-main ======= >>>>>>> d7efff9563 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.gt.partition.postgis.dialect.functions.{LogCleaner, TruncateToPartition, TruncateToTenMinutes} import org.locationtech.geomesa.gt.partition.postgis.dialect.procedures._ import org.locationtech.geomesa.gt.partition.postgis.dialect.tables._ @@ -316,6 +323,7 @@ import org.opengis.feature.`type`.{AttributeDescriptor, GeometryDescriptor} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.opengis.feature.`type`.AttributeDescriptor >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) @@ -435,6 +443,11 @@ import org.opengis.feature.`type`.AttributeDescriptor import org.opengis.feature.`type`.AttributeDescriptor >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +======= +import org.opengis.feature.`type`.AttributeDescriptor +>>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main import org.opengis.feature.simple.SimpleFeatureType import org.opengis.filter.Filter @@ -444,6 +457,7 @@ import scala.util.Try <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) ======= @@ -556,6 +570,10 @@ import scala.util.Try ======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +======= +>>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(store) with StrictLogging { @@ -773,6 +791,7 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -806,6 +825,8 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto >>>>>>> locationtech-main ======= >>>>>>> d7efff9563 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) +======= +>>>>>>> locationtech-main override def splitFilter(filter: Filter, schema: SimpleFeatureType): Array[Filter] = { import PartitionedPostgisDialect.Config.ConfigConversions super.splitFilter(SplitFilterVisitor(filter, schema.isFilterWholeWorld), schema) @@ -814,6 +835,7 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= <<<<<<< HEAD @@ -843,6 +865,8 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto ======= >>>>>>> d30ebb4092 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) >>>>>>> 4983e191e6 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main override def splitFilter(filter: Filter, schema: SimpleFeatureType): Array[Filter] = super.splitFilter(LiteralFunctionVisitor(filter), schema) @@ -851,6 +875,7 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) ======= @@ -1014,6 +1039,14 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto ======= >>>>>>> cf1d94c7a8 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> bf9e5cdd91 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> 713060f3a2 (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) +======= +<<<<<<< HEAD +======= +>>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> 42af7673bd (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main override def registerClassToSqlMappings(mappings: java.util.Map[Class[_], Integer]): Unit = { super.registerClassToSqlMappings(mappings) @@ -1032,6 +1065,13 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto override def encodePostColumnCreateTable(att: AttributeDescriptor, sql: StringBuffer): Unit = { <<<<<<< HEAD +<<<<<<< HEAD +======= + import PartitionedPostgisDialect.Config.GeometryAttributeConversions +======= +<<<<<<< HEAD +>>>>>>> 7542dc78d8 (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main att match { case gd: GeometryDescriptor => val nullable = gd.getMinOccurs <= 0 || gd.isNillable @@ -1040,21 +1080,16 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto if (i == -1 || (nullable && i != sql.length() - 8) || (!nullable && i != sql.length() - 17)) { logger.warn(s"Found geometry-type attribute but no geometry column binding: $sql") } else { - val srid = - Option(gd.getUserData.get(JDBCDataStore.JDBC_NATIVE_SRID).asInstanceOf[Integer]) - .orElse(Option(gd.getCoordinateReferenceSystem).flatMap(crs => Try(CRS.lookupEpsgCode(crs, true)).filter(_ != null).toOption)) - .map(_.intValue()) - .getOrElse(-1) + val srid = gd.getSrid.getOrElse(-1) val geomType = PartitionedPostgisDialect.GeometryMappings.getOrElse(gd.getType.getBinding, "GEOMETRY") - val geomTypeWithDims = - Option(gd.getUserData.get(Hints.COORDINATE_DIMENSION).asInstanceOf[Integer]).map(_.intValue) match { - case None | Some(2) => geomType - case Some(3) => s"${geomType}Z" - case Some(4) => s"${geomType}ZM" - case Some(d) => - throw new IllegalArgumentException( - s"PostGIS only supports geometries with 2, 3 and 4 dimensions, but found: $d") - } + val geomTypeWithDims = gd.getCoordinateDimensions match { + case None | Some(2) => geomType + case Some(3) => s"${geomType}Z" + case Some(4) => s"${geomType}ZM" + case Some(d) => + throw new IllegalArgumentException( + s"PostGIS only supports geometries with 2, 3 and 4 dimensions, but found: $d") + } sql.insert(i + 8, s" ($geomTypeWithDims, $srid)") } @@ -1079,6 +1114,7 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto case _ => // no-op <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD super.encodePostColumnCreateTable(att, sql) @@ -1086,6 +1122,10 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto <<<<<<< HEAD ======= >>>>>>> 230ae6c3ab (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +======= + super.encodePostColumnCreateTable(att, sql) +>>>>>>> locationtech-main if (att.isJson()) { // replace 'VARCHAR' with jsonb val i = sql.lastIndexOf(" VARCHAR") @@ -1096,6 +1136,7 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto } } else if (att.isList) { <<<<<<< HEAD +<<<<<<< HEAD ======= if (att.isList) { >>>>>>> 3a1e1d7213 (GEOMESA-3215 Postgis - support List-type attributes) @@ -1106,6 +1147,8 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto super.encodePostColumnCreateTable(att, sql) if (att.isList) { >>>>>>> bf9e5cdd91 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main // go back and encode the array type in the CQL create statement val i = sql.lastIndexOf(" ARRAY") if (i == sql.length() - 6) { @@ -1115,10 +1158,13 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto } >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 09d87762c5 (GEOMESA-3254 Add Bloop build support) ======= >>>>>>> bf9e5cdd91 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main } } @@ -1170,6 +1216,7 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf9e5cdd91 (GEOMESA-3215 Postgis - support List-type attributes) ======= @@ -1851,9 +1898,12 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto ======= <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= >>>>>>> dcd872c1a (GEOMESA-3212 Postgis - convert constant functions to literals for SQL translation (#2875)) ======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +<<<<<<< HEAD >>>>>>> 42af7673b (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> 6d3c0ecb75 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> 75e1524a30 (GEOMESA-3215 Postgis - support List-type attributes) @@ -2598,6 +2648,8 @@ class PartitionedPostgisDialect(store: JDBCDataStore) extends PostGISDialect(sto ======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main } object PartitionedPostgisDialect { @@ -2729,5 +2781,15 @@ object PartitionedPostgisDialect { def getCoordinateDimensions: Option[Int] = Option(d.getUserData.get(Hints.COORDINATE_DIMENSION)).map(int) } + + implicit class GeometryAttributeConversions(val d: GeometryDescriptor) extends AnyVal { + def getSrid: Option[Int] = + Option(d.getUserData.get(JDBCDataStore.JDBC_NATIVE_SRID)).map(int) + .orElse( + Option(d.getCoordinateReferenceSystem) + .flatMap(crs => Try(CRS.lookupEpsgCode(crs, true)).filter(_ != null).toOption.map(_.intValue()))) + def getCoordinateDimensions: Option[Int] = + Option(d.getUserData.get(Hints.COORDINATE_DIMENSION)).map(int) + } } } diff --git a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisPsDialect.scala b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisPsDialect.scala index e20e9d2e9b38..cb9573fcf226 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisPsDialect.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/PartitionedPostgisPsDialect.scala @@ -50,6 +50,7 @@ package org.locationtech.geomesa.gt.partition.postgis.dialect <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> eb44b0e44 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) ======= @@ -400,10 +401,15 @@ import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine, LoadingCache} ======= import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine, LoadingCache} ======= +======= +import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine, LoadingCache} +======= +>>>>>>> locationtech-main >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) ======= import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine, LoadingCache} >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +<<<<<<< HEAD >>>>>>> 8dc8f9c76d (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) ======= <<<<<<< HEAD @@ -667,6 +673,8 @@ import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine, LoadingCache} import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine, LoadingCache} >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +>>>>>>> locationtech-main import org.geotools.data.postgis.PostGISPSDialect import org.geotools.jdbc.JDBCDataStore import org.opengis.feature.`type`.AttributeDescriptor @@ -687,6 +695,7 @@ import org.opengis.filter.Filter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1000,6 +1009,8 @@ import org.opengis.filter.Filter >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) ======= >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +>>>>>>> locationtech-main import java.sql.{Connection, DatabaseMetaData, PreparedStatement, Types} import java.util.Locale import java.util.concurrent.TimeUnit @@ -1008,6 +1019,7 @@ import java.sql.{Connection, DatabaseMetaData} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1421,11 +1433,15 @@ import java.util.concurrent.TimeUnit ======= >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) ======= +>>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main +======= import java.sql.{Connection, DatabaseMetaData, PreparedStatement, Types} import java.util.Locale import java.util.concurrent.TimeUnit >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e243573ba4 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) <<<<<<< HEAD >>>>>>> 45ed5ccca0 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) @@ -1523,6 +1539,8 @@ import java.util.concurrent.TimeUnit >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) ======= >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +>>>>>>> locationtech-main class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPostgisDialect) extends PostGISPSDialect(store, delegate){ @@ -1541,6 +1559,7 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1893,6 +1912,8 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) ======= >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +>>>>>>> locationtech-main import PartitionedPostgisPsDialect.PreparedStatementKey import scala.collection.JavaConverters._ @@ -1900,6 +1921,7 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1966,6 +1988,8 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos >>>>>>> locationtech-main ======= >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +>>>>>>> locationtech-main ======= import PartitionedPostgisPsDialect.PreparedStatementKey @@ -1973,6 +1997,7 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2034,6 +2059,8 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos >>>>>>> locationtech-main ======= >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +>>>>>>> locationtech-main // cache for tracking json-type columns private val jsonColumns: LoadingCache[PreparedStatementKey, java.lang.Boolean] = Caffeine.newBuilder() @@ -2079,6 +2106,7 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) ======= @@ -2191,6 +2219,10 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +======= +>>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +>>>>>>> locationtech-main } else { super.setValue(value, binding, ps, column, cx) } @@ -2214,6 +2246,7 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2525,9 +2558,12 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos <<<<<<< HEAD ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -2692,6 +2728,8 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +>>>>>>> locationtech-main override protected def convertToArray( value: Any, componentTypeName: String, componentType: Class[_], connection: Connection): java.sql.Array = { val array = value match { @@ -2713,6 +2751,7 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2868,6 +2907,8 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos delegate.postCreateAttribute(att, tableName, schemaName, cx) >>>>>>> b9e2900546 (GEOMESA-3301 Partitioned PostGIS - fix Avro export) ======= +======= +>>>>>>> locationtech-main override def postCreateAttribute(att: AttributeDescriptor, tableName: String, schemaName: String, cx: Connection): Unit = delegate.postCreateAttribute(att, tableName, schemaName, cx) ======= @@ -2877,7 +2918,10 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos override def encodeTableName(raw: String, sql: StringBuffer): Unit = delegate.encodeTableName(raw, sql) >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> 7542dc78d8 (GEOMESA-3215 Postgis - support List-type attributes) +<<<<<<< HEAD >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main override def postCreateFeatureType( featureType: SimpleFeatureType, metadata: DatabaseMetaData, @@ -2905,6 +2949,7 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3326,6 +3371,10 @@ class PartitionedPostgisPsDialect(store: JDBCDataStore, delegate: PartitionedPos ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +======= +>>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +>>>>>>> locationtech-main object PartitionedPostgisPsDialect { @@ -3358,6 +3407,7 @@ object PartitionedPostgisPsDialect { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> eb44b0e44 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) ======= @@ -3575,9 +3625,12 @@ object PartitionedPostgisPsDialect { >>>>>>> 42af7673bd (GEOMESA-3215 Postgis - support List-type attributes) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +<<<<<<< HEAD >>>>>>> 8dc8f9c76d (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) <<<<<<< HEAD ======= @@ -3876,3 +3929,5 @@ object PartitionedPostgisPsDialect { ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +>>>>>>> locationtech-main diff --git a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/procedures/PartitionWriteAheadLog.scala b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/procedures/PartitionWriteAheadLog.scala index 2b40d35c3b94..2651d10438b1 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/procedures/PartitionWriteAheadLog.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/procedures/PartitionWriteAheadLog.scala @@ -66,6 +66,7 @@ object PartitionWriteAheadLog extends SqlProcedure { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= | AND relname != ${WriteAheadTable.writesPartition(info).asLiteral} >>>>>>> f639b39b8 (GEOMESA-3208 Postgis - Fix camel-case feature type names) @@ -185,6 +186,11 @@ object PartitionWriteAheadLog extends SqlProcedure { | AND relname != ${WriteAheadTable.writesPartition(info).asLiteral} >>>>>>> f639b39b8 (GEOMESA-3208 Postgis - Fix camel-case feature type names) >>>>>>> eabc30be69 (GEOMESA-3208 Postgis - Fix camel-case feature type names) +======= +======= + | AND relname != ${WriteAheadTable.writesPartition(info).asLiteral} +>>>>>>> f639b39b8 (GEOMESA-3208 Postgis - Fix camel-case feature type names) +>>>>>>> locationtech-main | ORDER BY name | LOOP | diff --git a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/procedures/RollWriteAheadLog.scala b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/procedures/RollWriteAheadLog.scala index 10a8efab6d65..707a6f6e8a34 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/procedures/RollWriteAheadLog.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/procedures/RollWriteAheadLog.scala @@ -67,6 +67,7 @@ object RollWriteAheadLog extends SqlProcedure with CronSchedule { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -219,12 +220,17 @@ object RollWriteAheadLog extends SqlProcedure with CronSchedule { >>>>>>> 2eb5450278 (GEOMESA-3208 Postgis - Fix camel-case feature type names) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= | -- call to format fixes errors with non-lower-case identifiers | IF EXISTS(SELECT 1 FROM $writePartition) THEN | SELECT nextval(format('%I', ${literal(table.name.raw, "seq")})) INTO seq_val; >>>>>>> f639b39b8 (GEOMESA-3208 Postgis - Fix camel-case feature type names) +<<<<<<< HEAD >>>>>>> eabc30be69 (GEOMESA-3208 Postgis - Fix camel-case feature type names) +======= +>>>>>>> locationtech-main | | -- format the table name to be 3 digits, with leading zeros as needed | next_partition := ${literal(table.name.raw + "_")} || lpad(seq_val::text, 3, '0'); diff --git a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/tables/WriteAheadTable.scala b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/tables/WriteAheadTable.scala index 6867723c1542..051955248fb6 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/tables/WriteAheadTable.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/main/scala/org/locationtech/geomesa/gt/partition/postgis/dialect/tables/WriteAheadTable.scala @@ -22,6 +22,7 @@ object WriteAheadTable extends SqlStatements { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -70,6 +71,9 @@ object WriteAheadTable extends SqlStatements { ======= ======= >>>>>>> 13c719556e (GEOMESA-3209 Postgis - allow for re-creation of schema if _wa table exists) +======= +======= +>>>>>>> locationtech-main val partition = writesPartition(info).qualified val seq = s"CREATE SEQUENCE IF NOT EXISTS ${escape(table.name.raw, "seq")} AS smallint MINVALUE 1 MAXVALUE 999 CYCLE;" // rename the table created by the JdbcDataStore to be the write ahead table @@ -92,6 +96,7 @@ object WriteAheadTable extends SqlStatements { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c61a3b395 (GEOMESA-3209 Postgis - allow for re-creation of schema if _wa table exists) ======= <<<<<<< HEAD @@ -172,6 +177,9 @@ object WriteAheadTable extends SqlStatements { ======= >>>>>>> c61a3b395 (GEOMESA-3209 Postgis - allow for re-creation of schema if _wa table exists) >>>>>>> 13c719556e (GEOMESA-3209 Postgis - allow for re-creation of schema if _wa table exists) +======= +>>>>>>> c61a3b395 (GEOMESA-3209 Postgis - allow for re-creation of schema if _wa table exists) +>>>>>>> locationtech-main val (tableTs, indexTs) = table.tablespace match { case None => ("", "") case Some(ts) => (s" TABLESPACE ${ts.quoted}", s" USING INDEX TABLESPACE ${ts.quoted}") diff --git a/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala b/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala index 73a88746877f..016bae935187 100644 --- a/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala +++ b/geomesa-gt/geomesa-gt-partitioning/src/test/scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala @@ -22,6 +22,7 @@ import org.geotools.feature.simple.SimpleFeatureBuilder <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.geotools.feature.simple.SimpleFeatureBuilder ======= ======= @@ -219,6 +220,8 @@ import org.geotools.feature.simple.SimpleFeatureBuilder >>>>>>> locationtech-main import org.geotools.feature.simple.SimpleFeatureBuilder ======= +======= +>>>>>>> locationtech-main import org.geotools.data.postgis.PostGISPSDialect <<<<<<< HEAD ======= @@ -228,6 +231,7 @@ import org.geotools.filter.identity.FeatureIdImpl >>>>>>> cf1d94c7a (GEOMESA-3215 Postgis - support List-type attributes) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -287,12 +291,15 @@ import org.geotools.filter.identity.FeatureIdImpl >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> 47f8de1bb (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> afb207dc68 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main import org.geotools.filter.text.ecql.ECQL import org.geotools.jdbc.JDBCDataStore import org.geotools.referencing.CRS import org.junit.runner.RunWith import org.locationtech.geomesa.filter.FilterHelper import org.locationtech.geomesa.gt.partition.postgis.dialect.procedures.{DropAgedOffPartitions, PartitionMaintenance, RollWriteAheadLog} +<<<<<<< HEAD import org.locationtech.geomesa.gt.partition.postgis.dialect.tables.UserDataTable <<<<<<< HEAD import org.locationtech.geomesa.gt.partition.postgis.dialect.{TableConfig, TypeInfo} @@ -395,6 +402,10 @@ import org.locationtech.geomesa.gt.partition.postgis.dialect.tables.{PartitionTa >>>>>>> f1a535f4fb (GEOMESA-3300 Partitioned PostGIS - delete _spill table on removeSchema) import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgisDialect, PartitionedPostgisPsDialect, TableConfig, TypeInfo} >>>>>>> 008807b427 (GEOMESA-3295 Partitioned PostGIS - default to using prepared statements (#2993)) +======= +import org.locationtech.geomesa.gt.partition.postgis.dialect.tables.{PartitionTablespacesTable, PrimaryKeyTable, SequenceTable, UserDataTable} +import org.locationtech.geomesa.gt.partition.postgis.dialect.{PartitionedPostgisDialect, PartitionedPostgisPsDialect, TableConfig, TypeInfo} +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.collection.SelfClosingIterator import org.locationtech.geomesa.utils.geotools.{FeatureUtils, ObjectType, SimpleFeatureTypes} import org.locationtech.geomesa.utils.io.WithClose @@ -551,6 +562,7 @@ import java.util.concurrent.CopyOnWriteArrayList import java.util.logging.{Handler, Level, LogRecord} import java.util.{Collections, Locale} <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -654,6 +666,9 @@ import scala.annotation.tailrec ======= import scala.collection.mutable.ArrayBuffer >>>>>>> f1a535f4fb (GEOMESA-3300 Partitioned PostGIS - delete _spill table on removeSchema) +======= +import scala.collection.mutable.ArrayBuffer +>>>>>>> locationtech-main import scala.util.Try import scala.util.control.NonFatal @@ -733,6 +748,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1375,6 +1391,15 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll "name:List[String],props:String:json=true,age:Int,dtg:Date,*geom:Point:srid=4326;" + >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= + "name:List[String],props:String:json=true,age:Int,dtg:Date,*geom:Point:srid=4326;" + +======= + "name:List[String],age:Int,dtg:Date,*geom:Point:srid=4326;" + +>>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +======= + "name:List[String],props:String:json=true,age:Int,dtg:Date,*geom:Point:srid=4326;" + +>>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +>>>>>>> locationtech-main Seq( s"pg.partitions.interval.hours=$hours", "pg.partitions.cron.minute=0"/*, @@ -1576,6 +1601,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll "host" -> host, "port" -> port, <<<<<<< HEAD +<<<<<<< HEAD ======= "host" -> container.getHost, "port" -> container.getFirstMappedPort.toString, @@ -1624,6 +1650,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll "schema" -> schema, ======= >>>>>>> ed6355ceb8 (GEOMESA-3294 Partitioned PostGIS - use default database schema if not specified) +======= +>>>>>>> locationtech-main "database" -> "postgres", "user" -> "postgres", "passwd" -> "postgres", @@ -2042,6 +2070,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll ======= logger.info(s"Existing type names: ${ds.getTypeNames.mkString(", ")}") +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2225,6 +2254,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll ======= <<<<<<< HEAD >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main val schema = Try(ds.getSchema(sft.getTypeName)).getOrElse(null) schema must not(beNull) schema.getUserData.asScala must containAllOf(sft.getUserData.asScala.toSeq) @@ -2235,6 +2266,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2377,6 +2409,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD ======= >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) @@ -2384,6 +2418,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main val schema = Try(ds.getSchema(sft.getTypeName)).getOrElse(null) schema must not(beNull) @@ -2411,6 +2446,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll >>>>>>> eabc30be69 (GEOMESA-3208 Postgis - Fix camel-case feature type names) ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main val schema = Try(ds.getSchema(sft.getTypeName)).getOrElse(null) schema must not(beNull) schema.getUserData.asScala must containAllOf(sft.getUserData.asScala.toSeq) @@ -2423,6 +2460,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f9969bc4e9 (GEOMESA-3208 Postgis - Fix camel-case feature type names) @@ -2562,6 +2600,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll ======= ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main ======= val userData = Try(ds.getSchema(sft.getTypeName)).map(_.getUserData.asScala).getOrElse(null) userData must not(beNull) @@ -2571,6 +2611,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll >>>>>>> 203dda21b (GEOMESA-3208 Postgis - Fix camel-case feature type names) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f9969bc4e9 (GEOMESA-3208 Postgis - Fix camel-case feature type names) ======= >>>>>>> 42af7673bd (GEOMESA-3215 Postgis - support List-type attributes) @@ -2626,6 +2667,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll >>>>>>> 48c6002574 (GEOMESA-3208 Postgis - Fix camel-case feature type names) >>>>>>> eabc30be69 (GEOMESA-3208 Postgis - Fix camel-case feature type names) ======= +======= +>>>>>>> locationtech-main >>>>>>> 48c6002574 (GEOMESA-3208 Postgis - Fix camel-case feature type names) ======= ======= @@ -2633,7 +2676,10 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> cf1d94c7a (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> 42af7673bd (GEOMESA-3215 Postgis - support List-type attributes) +<<<<<<< HEAD >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main // write some data WithClose(new DefaultTransaction()) { tx => @@ -2793,6 +2839,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll } } } +<<<<<<< HEAD <<<<<<< HEAD if (methods.delete) { @@ -3020,6 +3067,9 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +======= +>>>>>>> locationtech-main WithClose(ds.getFeatureReader(new Query(sft.getTypeName), Transaction.AUTO_COMMIT)) { reader => reader.hasNext must beFalse @@ -3031,6 +3081,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds.removeSchema(sft.getTypeName) ======= @@ -3049,6 +3100,10 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll ds.removeSchema(sft.getTypeName) ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= + ds.removeSchema(sft.getTypeName) +======= +>>>>>>> locationtech-main if (methods.query) { WithClose(ds.getFeatureReader(new Query(sft.getTypeName), Transaction.AUTO_COMMIT)) { reader => while (reader.hasNext) { @@ -3081,6 +3136,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> c3367776f (GEOMESA-3261 Postgis - Fix age-off for non-alpha feature type names) @@ -3143,6 +3199,9 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll ======= >>>>>>> 42af7673bd (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> 42af7673bd (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main } catch { case NonFatal(e) => logger.error("", e); ko } finally { @@ -3158,6 +3217,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -3416,6 +3476,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll >>>>>>> locationtech-main ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main "age-off" in { val ds = DataStoreFinder.getDataStore(params.asJava) ds must not(beNull) @@ -3661,6 +3723,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll } } +<<<<<<< HEAD "remove whole-world filters" in { val ds = DataStoreFinder.getDataStore(params.asJava) ds must not(beNull) @@ -4988,6 +5051,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll >>>>>>> 61951ec00 (GEOMESA-3260 Postgis - fix age-off bug (#2958)) } +======= +>>>>>>> locationtech-main "remove whole-world filters" in { val ds = DataStoreFinder.getDataStore(params.asJava) ds must not(beNull) @@ -5066,6 +5131,60 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll } finally { ds.dispose() } +======= +<<<<<<< HEAD + step { + if (container != null) { + container.stop() +>>>>>>> 42af7673bd (GEOMESA-3215 Postgis - support List-type attributes) + } + + "default to using prepared statements" in { + foreach(Seq(params, params + ("preparedStatements" -> "true"), params - "preparedStatements")) { params => + val ds = DataStoreFinder.getDataStore(params.asJava) + ds must not(beNull) + try { + ds must beAnInstanceOf[JDBCDataStore] + ds.asInstanceOf[JDBCDataStore].getSQLDialect must beAnInstanceOf[PartitionedPostgisPsDialect] + } finally { + ds.dispose() + } + } + foreach(Seq(params + ("preparedStatements" -> "false"))) { params => + val ds = DataStoreFinder.getDataStore(params.asJava) + ds must not(beNull) + try { + ds must beAnInstanceOf[JDBCDataStore] + ds.asInstanceOf[JDBCDataStore].getSQLDialect must beAnInstanceOf[PartitionedPostgisDialect] // not partitioned + } finally { + ds.dispose() + } + } + } + + "set appropriate user data for list and json attributes" in { + val ds = DataStoreFinder.getDataStore(params.asJava) + ds must not(beNull) + + try { + ds must beAnInstanceOf[JDBCDataStore] + + val sft = SimpleFeatureTypes.renameSft(this.sft, "attrtest") + ds.getTypeNames.toSeq must not(contain(sft.getTypeName)) + ds.createSchema(sft) + + val schema = Try(ds.getSchema(sft.getTypeName)).getOrElse(null) + schema must not(beNull) + schema.getUserData.asScala must containAllOf(sft.getUserData.asScala.toSeq) + logger.debug(s"Schema: ${SimpleFeatureTypes.encodeType(schema)}") + + ObjectType.selectType(schema.getDescriptor("name")) mustEqual Seq(ObjectType.LIST, ObjectType.STRING) + ObjectType.selectType(schema.getDescriptor("props")) mustEqual Seq(ObjectType.STRING, ObjectType.JSON) + ObjectType.selectType(schema.getDescriptor("dtg")) mustEqual Seq(ObjectType.DATE) + ObjectType.selectType(schema.getDescriptor("geom")) mustEqual Seq(ObjectType.GEOMETRY, ObjectType.POINT) + } finally { + ds.dispose() + } } } @@ -5396,6 +5515,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -5418,6 +5538,8 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll >>>>>>> location-main ======= >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= +>>>>>>> locationtech-main ======= case class Methods( create: Boolean, @@ -5437,6 +5559,7 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll >>>>>>> cf1d94c7a (GEOMESA-3215 Postgis - support List-type attributes) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6d3c0ecb75 (GEOMESA-3215 Postgis - support List-type attributes) <<<<<<< HEAD ======= @@ -6011,4 +6134,10 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll ) >>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) >>>>>>> a980818468 (GEOMESA-3215 Postgis - support List-type attributes) +======= + } +======= + ) +>>>>>>> ee1d5f207 (GEOMESA-3215 Postgis - support List-type attributes) +>>>>>>> locationtech-main } diff --git a/geomesa-gt/geomesa-gt-spark-runtime/pom.xml b/geomesa-gt/geomesa-gt-spark-runtime/pom.xml index 942b32fb8d74..0bb47a94a3e7 100644 --- a/geomesa-gt/geomesa-gt-spark-runtime/pom.xml +++ b/geomesa-gt/geomesa-gt-spark-runtime/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 @@ -11275,6 +11341,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= @@ -11387,6 +11454,10 @@ ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main compile @@ -11484,6 +11555,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11603,6 +11675,11 @@ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main org.apache.parquet org.locationtech.geomesa.shaded.org.apache.parquet diff --git a/geomesa-gt/geomesa-gt-spark/pom.xml b/geomesa-gt/geomesa-gt-spark/pom.xml index 0d20468aa351..d738da811830 100644 --- a/geomesa-gt/geomesa-gt-spark/pom.xml +++ b/geomesa-gt/geomesa-gt-spark/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-gt/geomesa-gt-tools/pom.xml b/geomesa-gt/geomesa-gt-tools/pom.xml index 4591fa812249..999bce00dd4c 100644 --- a/geomesa-gt/geomesa-gt-tools/pom.xml +++ b/geomesa-gt/geomesa-gt-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-gt/pom.xml b/geomesa-gt/pom.xml index bed68a22d64e..bd748ca1a333 100644 --- a/geomesa-gt/pom.xml +++ b/geomesa-gt/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-datastore/pom.xml b/geomesa-hbase/geomesa-hbase-datastore/pom.xml index 306149ca6204..4f5ab6b5cfc6 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/pom.xml +++ b/geomesa-hbase/geomesa-hbase-datastore/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStore.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStore.scala index 854ab7453655..b51773a02616 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStore.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStore.scala @@ -181,6 +181,7 @@ object HBaseDataStore { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= override def configure(params: java.util.Map[String, _ <: java.io.Serializable]): Unit = {} >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -300,5 +301,10 @@ object HBaseDataStore { override def configure(params: java.util.Map[String, _ <: java.io.Serializable]): Unit = {} >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= + override def configure(params: java.util.Map[String, _ <: java.io.Serializable]): Unit = {} +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main } } diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreFactory.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreFactory.scala index 326e23dd2580..9ca14a8f81a5 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreFactory.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreFactory.scala @@ -27,6 +27,7 @@ import org.geotools.data.{DataStore, DataStoreFactorySpi} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.geomesa.hbase.data.HBaseConnectionPool.ConnectionWrapper >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -122,11 +123,17 @@ import org.locationtech.geomesa.hbase.HBaseSystemProperties <<<<<<< HEAD >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +import org.locationtech.geomesa.hbase.HBaseSystemProperties +======= +<<<<<<< HEAD +>>>>>>> locationtech-main +======= import org.locationtech.geomesa.hbase.data.HBaseConnectionPool.ConnectionWrapper >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 234aacdc12 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 16f912e1ef (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -339,6 +346,8 @@ import org.locationtech.geomesa.hbase.data.HBaseConnectionPool.ConnectionWrapper >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.hbase.data.HBaseDataStore.NoAuthsProvider import org.locationtech.geomesa.hbase.data.HBaseDataStoreFactory.{CoprocessorConfig, EnabledCoprocessors, HBaseDataStoreConfig, HBaseQueryConfig} import org.locationtech.geomesa.index.geotools.GeoMesaDataStore diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseIndexAdapter.scala b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseIndexAdapter.scala index 5950fba90787..a5cfbc730eeb 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseIndexAdapter.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseIndexAdapter.scala @@ -600,6 +600,7 @@ object HBaseIndexAdapter extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= private val deleteVis = HBaseSystemProperties.DeleteVis.option.map(new CellVisibility(_)) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -719,6 +720,11 @@ object HBaseIndexAdapter extends LazyLogging { private val deleteVis = HBaseSystemProperties.DeleteVis.option.map(new CellVisibility(_)) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= + private val deleteVis = HBaseSystemProperties.DeleteVis.option.map(new CellVisibility(_)) +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main private val mutators = indices.toArray.map { index => val table = index.getTableNames(partition) match { diff --git a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBasePartitioningTest.scala b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBasePartitioningTest.scala index b3f5095d6443..499e418c49ac 100644 --- a/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBasePartitioningTest.scala +++ b/geomesa-hbase/geomesa-hbase-datastore/src/test/scala/org/locationtech/geomesa/hbase/data/HBasePartitioningTest.scala @@ -12,13 +12,17 @@ package org.locationtech.geomesa.hbase.data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= import java.time.{ZoneOffset, ZonedDateTime} import java.util.Date >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -137,6 +141,8 @@ import java.util.Date >>>>>>> locationtech-main ======= >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging import org.geotools.data._ import org.geotools.data.collection.ListFeatureCollection diff --git a/geomesa-hbase/geomesa-hbase-dist/pom.xml b/geomesa-hbase/geomesa-hbase-dist/pom.xml index ff738eacbec8..eabacd62a32f 100644 --- a/geomesa-hbase/geomesa-hbase-dist/pom.xml +++ b/geomesa-hbase/geomesa-hbase-dist/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase1/pom.xml b/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase1/pom.xml index 16b112ba4c5a..283fec14a474 100644 --- a/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase1/pom.xml +++ b/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase1/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main geomesa-hbase-distributed-runtime-hbase1_2.12 diff --git a/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase2/pom.xml b/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase2/pom.xml index 077a8554ec52..d1afbc23c2fd 100644 --- a/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase2/pom.xml +++ b/geomesa-hbase/geomesa-hbase-distributed-runtime-hbase2/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main geomesa-hbase-distributed-runtime-hbase2_2.12 diff --git a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml index cba061084625..a662e8273f25 100644 --- a/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml +++ b/geomesa-hbase/geomesa-hbase-gs-plugin/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-hbase/geomesa-hbase-jobs/pom.xml b/geomesa-hbase/geomesa-hbase-jobs/pom.xml index 73ee5fcbe7ff..bd3a45a884fb 100644 --- a/geomesa-hbase/geomesa-hbase-jobs/pom.xml +++ b/geomesa-hbase/geomesa-hbase-jobs/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-rpc/pom.xml b/geomesa-hbase/geomesa-hbase-rpc/pom.xml index bb076f78710d..c34909b1260a 100644 --- a/geomesa-hbase/geomesa-hbase-rpc/pom.xml +++ b/geomesa-hbase/geomesa-hbase-rpc/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-server-hbase1/pom.xml b/geomesa-hbase/geomesa-hbase-server-hbase1/pom.xml index c2aa9a014d63..999e6e5828bb 100644 --- a/geomesa-hbase/geomesa-hbase-server-hbase1/pom.xml +++ b/geomesa-hbase/geomesa-hbase-server-hbase1/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-server-hbase2/pom.xml b/geomesa-hbase/geomesa-hbase-server-hbase2/pom.xml index fdcb1e845775..75c08837bb1a 100644 --- a/geomesa-hbase/geomesa-hbase-server-hbase2/pom.xml +++ b/geomesa-hbase/geomesa-hbase-server-hbase2/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-server/pom.xml b/geomesa-hbase/geomesa-hbase-server/pom.xml index ea166b1134e7..57e029d31a13 100644 --- a/geomesa-hbase/geomesa-hbase-server/pom.xml +++ b/geomesa-hbase/geomesa-hbase-server/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime-hbase1/pom.xml b/geomesa-hbase/geomesa-hbase-spark-runtime-hbase1/pom.xml index 9bc3529678bc..6a4918e67e35 100644 --- a/geomesa-hbase/geomesa-hbase-spark-runtime-hbase1/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark-runtime-hbase1/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 @@ -11419,6 +11485,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11538,6 +11605,11 @@ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main org.apache.parquet org.locationtech.geomesa.shaded.org.apache.parquet diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml b/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml index c2abe32aec21..c7557dc204ec 100644 --- a/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 @@ -11406,6 +11472,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) @@ -11525,6 +11592,11 @@ >>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +======= + +>>>>>>> b9bdd406e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main org.apache.parquet org.locationtech.geomesa.shaded.org.apache.parquet diff --git a/geomesa-hbase/geomesa-hbase-spark/pom.xml b/geomesa-hbase/geomesa-hbase-spark/pom.xml index 8f95e95c423f..dabdfb10601b 100644 --- a/geomesa-hbase/geomesa-hbase-spark/pom.xml +++ b/geomesa-hbase/geomesa-hbase-spark/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/geomesa-hbase-tools/pom.xml b/geomesa-hbase/geomesa-hbase-tools/pom.xml index db9a7b2984e8..2e139d30822e 100644 --- a/geomesa-hbase/geomesa-hbase-tools/pom.xml +++ b/geomesa-hbase/geomesa-hbase-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-hbase/pom.xml b/geomesa-hbase/pom.xml index 289e58d49e7a..21ba8bdf874b 100644 --- a/geomesa-hbase/pom.xml +++ b/geomesa-hbase/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-index-api/pom.xml b/geomesa-index-api/pom.xml index 5d78583873be..5c1ab34a07c1 100644 --- a/geomesa-index-api/pom.xml +++ b/geomesa-index-api/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/api/GeoMesaFeatureIndex.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/api/GeoMesaFeatureIndex.scala index 79d016e165df..2c75c53011b7 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/api/GeoMesaFeatureIndex.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/api/GeoMesaFeatureIndex.scala @@ -20,6 +20,7 @@ package org.locationtech.geomesa.index.api <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d022c4bef (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= @@ -446,15 +447,22 @@ import java.util.UUID ======= >>>>>>> bad30768f2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) ======= +>>>>>>> locationtech-main +======= import java.nio.charset.StandardCharsets import java.util.UUID >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5666197b2a (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= ======= >>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) >>>>>>> bad30768f2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +======= +======= +>>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging import org.geotools.util.factory.Hints import org.locationtech.geomesa.index.api.GeoMesaFeatureIndex.IdFromRow @@ -484,6 +492,7 @@ import org.opengis.filter.{ExcludeFilter, Filter} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -630,6 +639,8 @@ import java.util.UUID >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= >>>>>>> 5666197b2a (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +>>>>>>> locationtech-main import java.nio.charset.StandardCharsets import java.util.UUID @@ -878,6 +889,7 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1142,6 +1154,10 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], ======= >>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) >>>>>>> bad30768f2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +======= +======= +>>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +>>>>>>> locationtech-main lazy val filterString = org.locationtech.geomesa.filter.filterToString(filter.filter.getOrElse(Filter.INCLUDE)) val block = @@ -1165,6 +1181,7 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4c943341c (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) ======= @@ -1363,11 +1380,14 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], >>>>>>> locationtech-main >>>>>>> 5b15f98fad (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= +======= +>>>>>>> locationtech-main ======= QueryProperties.BlockFullTableScans.onFullTableScan(sft.getTypeName, filter.filter.getOrElse(Filter.INCLUDE)) >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= >>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +<<<<<<< HEAD >>>>>>> 1f18a80880 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) ======= >>>>>>> d022c4bef (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) @@ -1528,6 +1548,8 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], ======= >>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) >>>>>>> bad30768f2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +======= +>>>>>>> locationtech-main } val keyRanges = Seq(UnboundedRange(null)) val byteRanges = Seq(BoundedByteRange(sharing, ByteArrays.rowFollowingPrefix(sharing))) @@ -1552,6 +1574,7 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= } else if (secondary == null) { >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) @@ -1671,6 +1694,11 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], } else if (secondary == null) { >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) >>>>>>> 5666197b2a (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +======= + } else if (secondary == null) { +>>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +>>>>>>> locationtech-main val byteRanges = keySpace.getRangeBytes(keyRanges.iterator, tier = true).map { case BoundedByteRange(lo, hi) => BoundedByteRange(lo, ByteArrays.concat(hi, ByteRange.UnboundedUpperRange)) case SingleRowByteRange(row) => BoundedByteRange(row, ByteArrays.concat(row, ByteRange.UnboundedUpperRange)) @@ -1724,6 +1752,7 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1744,6 +1773,8 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], >>>>>>> locationtech-main ======= >>>>>>> 5666197b2a (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +>>>>>>> locationtech-main ======= if (tiers.isEmpty) { Iterator.single(BoundedByteRange(row, ByteArrays.concat(row, ByteRange.UnboundedUpperRange))) @@ -1755,6 +1786,7 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1799,6 +1831,8 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], >>>>>>> locationtech-main ======= >>>>>>> 5666197b2a (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +>>>>>>> locationtech-main } case BoundedByteRange(lo, hi) => @@ -1820,6 +1854,7 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= ======= @@ -1958,6 +1993,9 @@ abstract class GeoMesaFeatureIndex[T, U](val ds: GeoMesaDataStore[_], ======= >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) >>>>>>> 5666197b2a (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +>>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +>>>>>>> locationtech-main case r => throw new IllegalArgumentException(s"Unexpected range type $r") } diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/QueryProperties.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/QueryProperties.scala index 68c641e465d2..345d1f0fe629 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/QueryProperties.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/conf/QueryProperties.scala @@ -42,6 +42,7 @@ object QueryProperties { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -103,6 +104,9 @@ object QueryProperties { ======= ======= >>>>>>> bad30768f2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +======= +======= +>>>>>>> locationtech-main val BlockFullTableScans = new SystemProperty("geomesa.scan.block-full-table", "false") { @deprecated("Deprecated with no replacement") def onFullTableScan(typeName: String, filter: Filter): Unit = { @@ -116,6 +120,7 @@ object QueryProperties { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) ======= <<<<<<< HEAD @@ -207,6 +212,9 @@ object QueryProperties { ======= >>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) >>>>>>> bad30768f2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +======= +>>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +>>>>>>> locationtech-main val BlockMaxThreshold: SystemProperty = SystemProperty("geomesa.scan.block-full-table.threshold", "1000") diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/attribute/DateIndexKeySpace.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/attribute/DateIndexKeySpace.scala index cb374c46a29e..0865228412ca 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/attribute/DateIndexKeySpace.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/index/attribute/DateIndexKeySpace.scala @@ -139,6 +139,7 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -540,11 +541,14 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c843b1759d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -755,6 +759,8 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) >>>>>>> bd17bd131 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 814abac33f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -768,6 +774,7 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f0b61142b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -1963,11 +1970,18 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) >>>>>>> 457bfde754 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= ======= +>>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 1690f5dad (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= +======= >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) >>>>>>> 54fb5ef95 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ce2ad87199 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) <<<<<<< HEAD >>>>>>> da4aaa8268 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) @@ -2142,9 +2156,14 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) ======= ======= ======= +>>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= +======= >>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= +<<<<<<< HEAD >>>>>>> fd0ea5e670 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 2b62bcaeb (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD @@ -2232,6 +2251,11 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 76328bb49 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case UnboundedRange(_) => val max = ByteArrays.rowFollowingPrefix(ByteArrays.toOrderedBytes(MaxUpperBound)) UnboundedByteRange(ByteArrays.toOrderedBytes(MinLowerBound), max) @@ -2279,6 +2303,7 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f4402ff40c (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -2717,11 +2742,14 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 54fb5ef95 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= >>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> da4aaa8268 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= @@ -2968,6 +2996,10 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) >>>>>>> bd17bd131 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 814abac33f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> locationtech-main +======= +>>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) @@ -2982,6 +3014,7 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -3546,12 +3579,18 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) >>>>>>> 457bfde754 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= ======= +======= +>>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3593,11 +3632,17 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) >>>>>>> ac86790d8a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= +======= +>>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 526e71304c (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> location-main @@ -4542,12 +4587,15 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) <<<<<<< HEAD >>>>>>> 582a3156f3 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 1690f5dad (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5e66748475 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> 4100fa1ce8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -4760,9 +4808,18 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) ======= ======= ======= +>>>>>>> 54fb5ef95 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +>>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 76328bb49 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= +<<<<<<< HEAD >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') >>>>>>> 8871b2b4b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD @@ -4839,6 +4896,9 @@ class DateIndexKeySpace(val sft: SimpleFeatureType, dtgField: String) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case r => throw new IllegalArgumentException(s"Unexpected range type $r") } } diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala index ac9e3b3bbe57..cd9232314344 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/planning/QueryPlanner.scala @@ -163,6 +163,7 @@ class QueryPlanner[DS <: GeoMesaDataStore[DS]](ds: DS) extends QueryRunner with <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bad30768f2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) ======= @@ -329,6 +330,9 @@ class QueryPlanner[DS <: GeoMesaDataStore[DS]](ds: DS) extends QueryRunner with ======= ======= >>>>>>> 5666197b2a (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +======= +>>>>>>> locationtech-main if (qs.values.isEmpty && qs.ranges.nonEmpty) { qs.filter.secondary.foreach { f => logger.warn( @@ -339,6 +343,7 @@ class QueryPlanner[DS <: GeoMesaDataStore[DS]](ds: DS) extends QueryRunner with <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -604,6 +609,11 @@ class QueryPlanner[DS <: GeoMesaDataStore[DS]](ds: DS) extends QueryRunner with ======= >>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) >>>>>>> bad30768f2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +======= +>>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +>>>>>>> 9e5293be2 (GEOMESA-3214 Fix warning about full table scan with Filter.EXCLUDE) +>>>>>>> locationtech-main ds.adapter.createQueryPlan(qs) } } diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedDataStoreView.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedDataStoreView.scala index 4d0428a1e2cb..e4b738afe90d 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedDataStoreView.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedDataStoreView.scala @@ -51,6 +51,7 @@ class MergedDataStoreView( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e8cc4971c6 (Merge branch 'feature/postgis-fixes') ======= @@ -258,11 +259,20 @@ class MergedDataStoreView( ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD + namespace: Option[String] = None + ) extends MergedDataStoreSchemas(stores.map(_._1), namespace) with HasGeoMesaFeatureReader with HasGeoMesaStats { +======= +>>>>>>> locationtech-main +======= >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c6103aab4 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -920,6 +930,11 @@ class MergedDataStoreView( ) extends MergedDataStoreSchemas(stores.map(_._1), namespace) with HasGeoMesaStats { >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= + namespace: Option[String] = None + ) extends MergedDataStoreSchemas(stores.map(_._1), namespace) with HasGeoMesaStats { +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main require(stores.nonEmpty, "No delegate stores configured") @@ -1189,6 +1204,7 @@ object MergedDataStoreView { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1477,6 +1493,8 @@ object MergedDataStoreView { >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') ======= >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> locationtech-main ======= val seq = if (parallel) { stats.par } else { stats } seq.flatMap(getSingle).reduceLeftOption(_ + _) @@ -1489,6 +1507,7 @@ object MergedDataStoreView { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2fc500c49 (GEOMESA-3202 Check for disjoint date queries in merged view store) <<<<<<< HEAD <<<<<<< HEAD @@ -1788,6 +1807,10 @@ object MergedDataStoreView { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } override def getMinMax[T]( @@ -1809,6 +1832,7 @@ object MergedDataStoreView { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1866,6 +1890,8 @@ object MergedDataStoreView { >>>>>>> locationtech-main ======= >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> locationtech-main ======= val bounds = stats.flatMap { case (stat, f) => stat.getMinMax[T](sft, attribute, mergeFilter(sft, filter, f), exact) @@ -1873,6 +1899,7 @@ object MergedDataStoreView { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2110,12 +2137,18 @@ object MergedDataStoreView { >>>>>>> ec6d06b576 (Merge branch 'feature/postgis-fixes') >>>>>>> locationtech-main ======= +======= + } +>>>>>>> locationtech-main ======= val seq = if (parallel) { stats.par } else { stats } seq.flatMap(getSingle).reduceLeftOption(_ + _) <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> 9fd67a154e (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> locationtech-main val bounds = stats.flatMap { case (stat, f) => stat.getMinMax[T](sft, attribute, mergeFilter(sft, filter, f), exact) } @@ -2124,6 +2157,7 @@ object MergedDataStoreView { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2414,6 +2448,11 @@ object MergedDataStoreView { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> eea6a40fa (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } override def getEnumeration[T]( diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedDataStoreViewFactory.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedDataStoreViewFactory.scala index 61caebf24396..31cf5c24ff95 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedDataStoreViewFactory.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedDataStoreViewFactory.scala @@ -403,6 +403,7 @@ object MergedDataStoreViewFactory extends GeoMesaDataStoreInfo with NamespacePar <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -480,19 +481,25 @@ object MergedDataStoreViewFactory extends GeoMesaDataStoreInfo with NamespacePar ======= ======= ======= +>>>>>>> locationtech-main +======= <<<<<<< HEAD <<<<<<< HEAD override val ParameterInfo: Array[GeoMesaParam[_ <: AnyRef]] = ConfigLoaderParam.toArray ++ Array(ConfigParam, DeduplicateParam) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main ======= >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD override val ParameterInfo: Array[GeoMesaParam[_ <: AnyRef]] = ConfigLoaderParam.toArray ++ Array(ConfigParam, DeduplicateParam) @@ -976,6 +983,10 @@ object MergedDataStoreViewFactory extends GeoMesaDataStoreInfo with NamespacePar ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main val ParallelScanParam = new GeoMesaParam[java.lang.Boolean]( "geomesa.merged.scan.parallel", diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedFeatureSourceView.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedFeatureSourceView.scala index f4f78e25aded..5b030cf2072f 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedFeatureSourceView.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedFeatureSourceView.scala @@ -385,6 +385,7 @@ class MergedFeatureSourceView( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') ======= @@ -517,6 +518,9 @@ class MergedFeatureSourceView( >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= >>>>>>> ec6d06b576 (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main +======= +======= >>>>>>> locationtech-main sources.foreach { case (source, filter) => @@ -539,6 +543,7 @@ class MergedFeatureSourceView( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0a65fe97e (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) ======= @@ -1001,6 +1006,10 @@ class MergedFeatureSourceView( >>>>>>> locationtech-main ======= >>>>>>> 0f854c43bb (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) +======= +======= +>>>>>>> 17b5ca670 (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) +>>>>>>> locationtech-main val source_bounds = source.getBounds(mergeFilter(sft, query, filter)) ======= val source_bounds = source.getBounds(mergeFilter(query, filter)) @@ -1016,12 +1025,15 @@ class MergedFeatureSourceView( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dbcb800c1 (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) ======= >>>>>>> e6cd678a4 (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ======= val source_bounds = source.getBounds(mergeFilter(query, filter)) >>>>>>> 0ab344f33 (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) @@ -1034,6 +1046,7 @@ class MergedFeatureSourceView( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2161,6 +2174,15 @@ class MergedFeatureSourceView( val source_bounds = source.getBounds(mergeFilter(query, filter)) >>>>>>> 74d905136 (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) >>>>>>> 6f3989530e (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) +======= + val source_bounds = source.getBounds(mergeFilter(sft, query, filter)) +>>>>>>> eea6a40fa (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> 17b5ca670 (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) +======= + val source_bounds = source.getBounds(mergeFilter(query, filter)) +>>>>>>> 74d905136 (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) +>>>>>>> locationtech-main if(source_bounds != null){ bounds.expandToInclude(source_bounds) } @@ -2168,6 +2190,7 @@ class MergedFeatureSourceView( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2461,6 +2484,11 @@ class MergedFeatureSourceView( ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 22da407b4 (GEOMESA-3153 Fix merged view to only expand bounds on non-null bounds (#2814)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main bounds } diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedQueryRunner.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedQueryRunner.scala index 00b3717824db..63f3535252f2 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedQueryRunner.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/MergedQueryRunner.scala @@ -31,6 +31,7 @@ import org.locationtech.geomesa.utils.iterators.{DeduplicatingSimpleFeatureItera <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.geomesa.utils.stats._ >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -150,6 +151,11 @@ import org.locationtech.geomesa.utils.stats._ import org.locationtech.geomesa.utils.stats._ >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +import org.locationtech.geomesa.utils.stats._ +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType} import org.opengis.filter.Filter @@ -464,6 +470,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -520,6 +527,9 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt ======= ======= >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> locationtech-main override def runQuery( sft: SimpleFeatureType, original: Query, @@ -530,6 +540,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -623,6 +634,9 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main val query = configureQuery(sft, original) val hints = query.getHints val maxFeatures = if (query.isMaxFeaturesUnlimited) { None } else { Option(query.getMaxFeatures) } @@ -643,6 +657,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -709,6 +724,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt >>>>>>> locationtech-main ======= >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> locationtech-main ======= q.setHints(new Hints(hints)) store.getFeatureReader(mergeFilter(sft, q, filter), Transaction.AUTO_COMMIT) @@ -716,6 +733,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -777,6 +795,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt >>>>>>> locationtech-main ======= >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> locationtech-main } if (hints.isDensityQuery) { @@ -829,6 +849,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -852,6 +873,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt >>>>>>> locationtech-main ======= >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main ======= val iters = if (deduplicate) { @@ -883,6 +906,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7ab33423d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -939,6 +963,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main Option(query.getSortBy).filterNot(_.isEmpty) match { ======= @@ -946,6 +972,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD @@ -959,6 +986,9 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt ======= >>>>>>> locationtech-main ======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -966,6 +996,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2c63a57a8 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -1036,6 +1067,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main val results = Option(query.getSortBy).filterNot(_.isEmpty) match { ======= @@ -1055,6 +1088,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 84634d919 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -1106,6 +1140,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt >>>>>>> location-main ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -1118,6 +1154,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 26fc359a06 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -1125,6 +1162,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= val results = Option(query.getSortBy).filterNot(_.isEmpty) match { @@ -1133,6 +1172,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Option(query.getSortBy).filterNot(_.isEmpty) match { >>>>>>> c6103aab4 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -1231,6 +1271,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt ======= Option(query.getSortBy).filterNot(_.isEmpty) match { >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main case None => SelfClosingIterator(iters.iterator).flatMap(i => i) case Some(sort) => val sortSft = QueryPlanner.extractQueryTransforms(sft, query).map(_._1).getOrElse(sft) @@ -1257,6 +1299,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c6103aab4 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -1347,6 +1390,9 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main } QueryResult(resultSft, hints, run) ======= @@ -1355,6 +1401,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -1387,6 +1434,16 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa2 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } maxFeatures match { @@ -1395,6 +1452,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -3398,6 +3456,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') @@ -3406,6 +3466,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0da1bb22c (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> locationtech-main @@ -3690,6 +3751,8 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt } >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 29f1317169 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main } } } @@ -3745,6 +3808,7 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3897,12 +3961,17 @@ class MergedQueryRunner(ds: HasGeoMesaStats, stores: Seq[(Queryable, Option[Filt >>>>>>> a2184c3082 (GEOMESA-3202 Check for disjoint date queries in merged view store) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main ======= val q = new Query(query) q.setHints(new Hints(hints)) store.getFeatureReader(mergeFilter(sft, q, filter), Transaction.AUTO_COMMIT) >>>>>>> 96cd783e7 (GEOMESA-3202 Check for disjoint date queries in merged view store) +<<<<<<< HEAD >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> locationtech-main } def getSingle(reader: FeatureReader[SimpleFeatureType, SimpleFeature]): CloseableIterator[SimpleFeature] = { diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/RoutedDataStoreViewFactory.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/RoutedDataStoreViewFactory.scala index 2bbd1b7cbd73..94238f8c8c3c 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/RoutedDataStoreViewFactory.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/RoutedDataStoreViewFactory.scala @@ -40,6 +40,7 @@ class RoutedDataStoreViewFactory extends DataStoreFactorySpi { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= override def createNewDataStore(params: java.util.Map[String, java.io.Serializable]): DataStore = { >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -159,6 +160,11 @@ class RoutedDataStoreViewFactory extends DataStoreFactorySpi { override def createNewDataStore(params: java.util.Map[String, java.io.Serializable]): DataStore = { >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> e8c8204435 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +======= + override def createNewDataStore(params: java.util.Map[String, java.io.Serializable]): DataStore = { +>>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main val config = ConfigFactory.parseString(ConfigParam.lookup(params)).resolve() val configs = if (config.hasPath("stores")) { config.getConfigList("stores").asScala } else { Seq.empty } if (configs.isEmpty) { diff --git a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/package.scala b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/package.scala index d309d8428187..e3f18a9b5a39 100644 --- a/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/package.scala +++ b/geomesa-index-api/src/main/scala/org/locationtech/geomesa/index/view/package.scala @@ -15,6 +15,7 @@ import org.geotools.data.simple.SimpleFeatureWriter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -121,12 +122,15 @@ import org.geotools.data._ ======= >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) ======= +>>>>>>> locationtech-main +======= import com.github.benmanes.caffeine.cache.{CacheLoader, Caffeine, LoadingCache} import com.typesafe.scalalogging.LazyLogging import org.geotools.data.simple.SimpleFeatureWriter import org.geotools.data._ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 96cd783e70 (GEOMESA-3202 Check for disjoint date queries in merged view store) <<<<<<< HEAD >>>>>>> 6f8af866fb (GEOMESA-3202 Check for disjoint date queries in merged view store) @@ -165,6 +169,9 @@ import org.geotools.data._ ======= >>>>>>> 96cd783e7 (GEOMESA-3202 Check for disjoint date queries in merged view store) >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +>>>>>>> 96cd783e7 (GEOMESA-3202 Check for disjoint date queries in merged view store) +>>>>>>> locationtech-main import org.geotools.feature.{AttributeTypeBuilder, FeatureTypes, NameImpl} import org.geotools.filter.text.ecql.ECQL import org.locationtech.geomesa.filter.{Bounds, FilterHelper, FilterValues} @@ -184,6 +191,9 @@ package object view extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= ======= ======= ======= @@ -196,6 +206,16 @@ package object view extends LazyLogging { } }) >>>>>>> 96cd783e7 (GEOMESA-3202 Check for disjoint date queries in merged view store) +>>>>>>> locationtech-main + + private val dateBounds: LoadingCache[(String, Filter), Option[FilterValues[Bounds[ZonedDateTime]]]] = + Caffeine.newBuilder().build(new CacheLoader[(String, Filter), Option[FilterValues[Bounds[ZonedDateTime]]]]() { + override def load(key: (String, Filter)): Option[FilterValues[Bounds[ZonedDateTime]]] = { + val (dtg, filter) = key + Some(FilterHelper.extractIntervals(filter, dtg)).filter(_.nonEmpty) + } + }) +>>>>>>> 96cd783e7 (GEOMESA-3202 Check for disjoint date queries in merged view store) >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) ======= @@ -389,6 +409,7 @@ package object view extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= dateBounds.get((dtg, f)).flatMap { left => >>>>>>> 96cd783e7 (GEOMESA-3202 Check for disjoint date queries in merged view store) @@ -508,6 +529,11 @@ package object view extends LazyLogging { dateBounds.get((dtg, f)).flatMap { left => >>>>>>> 96cd783e7 (GEOMESA-3202 Check for disjoint date queries in merged view store) >>>>>>> b4d1f55060 (GEOMESA-3202 Check for disjoint date queries in merged view store) +======= +======= + dateBounds.get((dtg, f)).flatMap { left => +>>>>>>> 96cd783e7 (GEOMESA-3202 Check for disjoint date queries in merged view store) +>>>>>>> locationtech-main val right = FilterHelper.extractIntervals(filter, dtg) val merged = FilterValues.and[Bounds[ZonedDateTime]](Bounds.intersection)(left, right) if (merged.disjoint) { diff --git a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala index 69ecd6fde500..f6cc134b1ad8 100644 --- a/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala +++ b/geomesa-index-api/src/test/scala/org/locationtech/geomesa/index/index/AttributeIndexTest.scala @@ -401,6 +401,7 @@ class AttributeIndexTest extends Specification with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -802,11 +803,14 @@ class AttributeIndexTest extends Specification with LazyLogging { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c843b1759d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -1017,6 +1021,8 @@ class AttributeIndexTest extends Specification with LazyLogging { >>>>>>> bd17bd131 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 814abac33f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -1030,6 +1036,7 @@ class AttributeIndexTest extends Specification with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f0b61142b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -2225,11 +2232,18 @@ class AttributeIndexTest extends Specification with LazyLogging { >>>>>>> 457bfde754 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= ======= +>>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 1690f5dad (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= +======= >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) >>>>>>> 54fb5ef95 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ce2ad87199 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) <<<<<<< HEAD >>>>>>> da4aaa8268 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) @@ -2404,9 +2418,14 @@ class AttributeIndexTest extends Specification with LazyLogging { ======= ======= ======= +>>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= +======= >>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= +<<<<<<< HEAD >>>>>>> fd0ea5e670 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 2b62bcaeb (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD @@ -2494,6 +2513,11 @@ class AttributeIndexTest extends Specification with LazyLogging { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 76328bb49 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "handle filter.EXCLUDE with query hint" in { val ds = new TestGeoMesaDataStore(true) @@ -2555,6 +2579,7 @@ class AttributeIndexTest extends Specification with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f4402ff40c (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -2993,11 +3018,14 @@ class AttributeIndexTest extends Specification with LazyLogging { <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 54fb5ef95 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= >>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> da4aaa8268 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= @@ -3244,6 +3272,10 @@ class AttributeIndexTest extends Specification with LazyLogging { >>>>>>> bd17bd131 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 814abac33f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> locationtech-main +======= +>>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= >>>>>>> b26fc9b51 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) @@ -3258,6 +3290,7 @@ class AttributeIndexTest extends Specification with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= @@ -3822,12 +3855,18 @@ class AttributeIndexTest extends Specification with LazyLogging { >>>>>>> 457bfde754 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) ======= ======= +======= +>>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 0d3cbc99a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3869,11 +3908,17 @@ class AttributeIndexTest extends Specification with LazyLogging { >>>>>>> ac86790d8a (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= ======= +======= +>>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> aa627812d (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 526e71304c (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> location-main @@ -4818,12 +4863,15 @@ class AttributeIndexTest extends Specification with LazyLogging { <<<<<<< HEAD >>>>>>> 582a3156f3 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 1690f5dad (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5e66748475 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD >>>>>>> 4100fa1ce8 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) @@ -5036,9 +5084,18 @@ class AttributeIndexTest extends Specification with LazyLogging { ======= ======= ======= +>>>>>>> 54fb5ef95 (GEOMESA-3203 Short-circuit disjoint filters in index scans (#2862)) +======= +>>>>>>> 914ec419f (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +======= +>>>>>>> 9b796685b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9bde42cc4 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) >>>>>>> 76328bb49 (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) ======= +<<<<<<< HEAD >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') >>>>>>> 8871b2b4b (GEOMESA-3102 Fix removal of user data in FileSystemDataStore.createSchema (#2787)) <<<<<<< HEAD @@ -5115,5 +5172,8 @@ class AttributeIndexTest extends Specification with LazyLogging { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } } diff --git a/geomesa-jobs/pom.xml b/geomesa-jobs/pom.xml index 8a85613b2788..6fad431e1e0a 100644 --- a/geomesa-jobs/pom.xml +++ b/geomesa-jobs/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml index 402346a0330a..e04505dc8507 100644 --- a/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml +++ b/geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml @@ -72,6 +72,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) @@ -91,12 +92,15 @@ ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1365,6 +1369,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -1389,6 +1395,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1927,10 +1934,13 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> d53e5acc27 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3584,10 +3594,13 @@ ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> 37b05c4d2e ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -4038,6 +4051,19 @@ ======= >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -4104,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -4722,11 +4749,17 @@ <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5459,6 +5492,10 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) ======= @@ -5493,6 +5530,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) @@ -5506,12 +5544,15 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6037,6 +6078,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -6062,6 +6105,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7319,6 +7363,10 @@ ======= ======= ======= +======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -7326,6 +7374,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -7408,12 +7457,21 @@ >>>>>>> locationtech-main ======= ======= +======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD ======= @@ -8888,6 +8946,15 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-jupyter/pom.xml b/geomesa-jupyter/pom.xml index d5b088e2412e..a200e03dcfa5 100644 --- a/geomesa-jupyter/pom.xml +++ b/geomesa-jupyter/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-confluent/pom.xml b/geomesa-kafka/geomesa-kafka-confluent/pom.xml index dae90deb28f9..1e4eff38507b 100644 --- a/geomesa-kafka/geomesa-kafka-confluent/pom.xml +++ b/geomesa-kafka/geomesa-kafka-confluent/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 jar diff --git a/geomesa-kafka/geomesa-kafka-confluent/src/main/scala/org/locationtech/geomesa/kafka/confluent/ConfluentFeatureSerializer.scala b/geomesa-kafka/geomesa-kafka-confluent/src/main/scala/org/locationtech/geomesa/kafka/confluent/ConfluentFeatureSerializer.scala index c37115f75053..938d36859e80 100644 --- a/geomesa-kafka/geomesa-kafka-confluent/src/main/scala/org/locationtech/geomesa/kafka/confluent/ConfluentFeatureSerializer.scala +++ b/geomesa-kafka/geomesa-kafka-confluent/src/main/scala/org/locationtech/geomesa/kafka/confluent/ConfluentFeatureSerializer.scala @@ -286,6 +286,7 @@ class ConfluentFeatureSerializer( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -342,6 +343,9 @@ class ConfluentFeatureSerializer( ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main override def deserialize(id: String, bytes: Array[Byte]): SimpleFeature = { val record = kafkaAvroDeserializers.get.deserialize("", bytes).asInstanceOf[GenericRecord] @@ -360,6 +364,7 @@ class ConfluentFeatureSerializer( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -423,6 +428,9 @@ class ConfluentFeatureSerializer( ======= >>>>>>> b09307f5c0 (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> b09307f5c0 (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main } // visibility field index in the avro schema @@ -491,6 +499,7 @@ class ConfluentFeatureSerializer( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= @@ -617,6 +626,11 @@ class ConfluentFeatureSerializer( <<<<<<< HEAD ======= >>>>>>> 7f390054c1 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +<<<<<<< HEAD +======= +>>>>>>> locationtech-main override def deserialize(id: String, bytes: Array[Byte]): SimpleFeature = { val record = kafkaAvroDeserializers.get.deserialize("", bytes).asInstanceOf[GenericRecord] @@ -654,6 +668,7 @@ class ConfluentFeatureSerializer( override def deserialize(in: InputStream): SimpleFeature = throw new NotImplementedError() +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -780,6 +795,9 @@ class ConfluentFeatureSerializer( ======= >>>>>>> d657014c8 (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> 7f390054c1 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> d657014c8 (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main override def deserialize(id: String, in: InputStream): SimpleFeature = throw new NotImplementedError() @@ -806,6 +824,7 @@ class ConfluentFeatureSerializer( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> location-main @@ -1006,6 +1025,10 @@ class ConfluentFeatureSerializer( ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main try { feature.getAttribute(m.sftIndex) match { case null => m.default.foreach(d => record.put(m.schemaIndex, d)) diff --git a/geomesa-kafka/geomesa-kafka-datastore/pom.xml b/geomesa-kafka/geomesa-kafka-datastore/pom.xml index a24d58b9c9e3..669ebcb2d774 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/pom.xml +++ b/geomesa-kafka/geomesa-kafka-datastore/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 jar diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaCacheLoader.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaCacheLoader.scala index 46ca40606672..2084202e4ac0 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaCacheLoader.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaCacheLoader.scala @@ -20,6 +20,7 @@ import org.locationtech.geomesa.kafka.versions.{KafkaConsumerVersions, RecordVer <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.locationtech.geomesa.kafka.{KafkaConsumerVersions, RecordVersions} >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) @@ -139,6 +140,11 @@ import org.locationtech.geomesa.kafka.{KafkaConsumerVersions, RecordVersions} import org.locationtech.geomesa.kafka.{KafkaConsumerVersions, RecordVersions} >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +import org.locationtech.geomesa.kafka.{KafkaConsumerVersions, RecordVersions} +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.concurrent.CachedThreadPool import org.locationtech.geomesa.utils.io.CloseWithLogging import org.opengis.feature.simple.SimpleFeatureType @@ -321,6 +327,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 42549e8e3 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -482,6 +489,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> c82e069f2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -491,6 +500,7 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> bbf7cc3b0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> bbf7cc3b0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -565,6 +575,8 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 08d14c1e3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -579,6 +591,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -636,6 +649,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> df6c06b4eb (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= +>>>>>>> locationtech-main +======= >>>>>>> ef0eb58d9 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= @@ -645,6 +660,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -681,6 +697,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 539ff4f7e7 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) @@ -699,6 +717,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -736,6 +755,11 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> d42d16549 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= @@ -743,6 +767,7 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -757,6 +782,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) @@ -775,6 +802,9 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -788,6 +818,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -834,12 +865,18 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> ef0eb58d9 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +>>>>>>> c82e069f2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> locationtech-main >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -854,6 +891,8 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 08d14c1e3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -874,6 +913,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -897,6 +937,11 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> 93cedd7b3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= @@ -904,6 +949,7 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -1455,11 +1501,14 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> c7b6fe2393 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 08d14c1e3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) >>>>>>> ad15fc9fe (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +<<<<<<< HEAD >>>>>>> 81230327e8 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) case _: Clear => cache.fireClear(timestamp); cache.clear() ======= @@ -6735,6 +6784,10 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 9c8ba870a0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) case _: Clear => cache.fireClear(timestamp); cache.clear() ======= +>>>>>>> locationtech-main +======= + case _: Clear => cache.fireClear(timestamp); cache.clear() +======= >>>>>>> locationtech-main case m: Clear => cache.fireClear(timestamp); cache.clear() >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) @@ -6822,6 +6875,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8d89556cb5 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= @@ -7530,6 +7584,10 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> c82e069f2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) @@ -7539,6 +7597,7 @@ object KafkaCacheLoader extends LazyLogging { case _: Clear => cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ef0eb58d93 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD ======= @@ -8859,6 +8918,10 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= case _: Clear => cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -8866,6 +8929,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8935,6 +8999,9 @@ object KafkaCacheLoader extends LazyLogging { ======= ======= >>>>>>> fa049272d1 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= case m: Clear => cache.fireClear(timestamp); cache.clear() @@ -8972,6 +9039,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c1d0543aac (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -13480,6 +13548,12 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 756b7b5666 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= case _: Clear => cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -13489,6 +13563,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c82e069f24 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD >>>>>>> 0c1272d3f0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -13499,6 +13574,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 7103b25bb7 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> af7a3e028 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= @@ -13517,6 +13594,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD >>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8421ce4b1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 70c6e3c2a9 (GEOMESA-3100 Kafka layer views (#2784)) @@ -13527,6 +13605,13 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 7e51f860b1 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= +======= +======= +======= +>>>>>>> 7c7dc18e8 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +======= +>>>>>>> locationtech-main case _: Clear => cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) >>>>>>> 08d14c1e3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -13535,6 +13620,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bbf7cc3b06 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD >>>>>>> b62f2f9ee6 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -13648,9 +13734,38 @@ object KafkaCacheLoader extends LazyLogging { ======= ======= ======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= + case _: Clear => cache.fireClear(timestamp); cache.clear() +>>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +>>>>>>> d42d16549 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +======= +>>>>>>> af7a3e028 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> ad15fc9fe (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= + case _: Clear => cache.fireClear(timestamp); cache.clear() +>>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 7c7dc18e8 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a62b956fb6 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> bbc8576d19 (GEOMESA-3100 Kafka layer views (#2784)) @@ -14872,6 +14987,13 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 7103b25bb7 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +======= +>>>>>>> c82e069f2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= <<<<<<< HEAD >>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -14887,13 +15009,17 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD >>>>>>> bbf7cc3b0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 539ff4f7e7 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -14902,14 +15028,21 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= case _: Clear => cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) >>>>>>> 93cedd7b3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89d0a858d2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= +>>>>>>> locationtech-main +======= ======= case _: Clear => cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -14917,6 +15050,7 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c7b6fe2393 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -14928,6 +15062,13 @@ object KafkaCacheLoader extends LazyLogging { case _: Clear => cache.fireClear(timestamp); cache.clear() >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> ad15fc9fe (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= + case _: Clear => cache.fireClear(timestamp); cache.clear() +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case m => throw new IllegalArgumentException(s"Unknown message: $m") } } @@ -15065,6 +15206,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 42549e8e3 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -15226,6 +15368,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> c82e069f2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -15235,6 +15379,7 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> bbf7cc3b0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> bbf7cc3b0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -15309,6 +15454,8 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 08d14c1e3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -15323,6 +15470,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15380,6 +15528,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> df6c06b4eb (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= +>>>>>>> locationtech-main +======= >>>>>>> ef0eb58d9 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= @@ -15389,6 +15539,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15425,6 +15576,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 539ff4f7e7 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) @@ -15443,6 +15596,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -15480,6 +15634,11 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> d42d16549 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= @@ -15487,6 +15646,7 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -15501,6 +15661,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) @@ -15519,6 +15681,9 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -15532,6 +15697,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -15578,12 +15744,18 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> ef0eb58d9 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +>>>>>>> c82e069f2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> locationtech-main >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -15598,6 +15770,8 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 08d14c1e3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -15618,6 +15792,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -15641,6 +15816,11 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> 93cedd7b3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= @@ -15648,6 +15828,7 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -16199,11 +16380,14 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> c7b6fe2393 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 08d14c1e3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) >>>>>>> ad15fc9fe (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +<<<<<<< HEAD >>>>>>> 81230327e8 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() ======= @@ -21479,6 +21663,10 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 9c8ba870a0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() ======= +>>>>>>> locationtech-main +======= + case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() +======= >>>>>>> locationtech-main case m: Clear => toLoad.cache.fireClear(timestamp); cache.clear() >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) @@ -21566,6 +21754,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8d89556cb5 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= @@ -22274,6 +22463,10 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> c82e069f2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) @@ -22283,6 +22476,7 @@ object KafkaCacheLoader extends LazyLogging { case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ef0eb58d93 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD ======= @@ -23603,6 +23797,10 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -23610,6 +23808,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -23679,6 +23878,9 @@ object KafkaCacheLoader extends LazyLogging { ======= ======= >>>>>>> fa049272d1 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= case m: Clear => toLoad.cache.fireClear(timestamp); cache.clear() @@ -23716,6 +23918,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c1d0543aac (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -28224,6 +28427,12 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 756b7b5666 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -28233,6 +28442,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c82e069f24 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD >>>>>>> 0c1272d3f0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -28243,6 +28453,8 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 7103b25bb7 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> af7a3e028 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= @@ -28261,6 +28473,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD >>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8421ce4b1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 70c6e3c2a9 (GEOMESA-3100 Kafka layer views (#2784)) @@ -28271,6 +28484,13 @@ object KafkaCacheLoader extends LazyLogging { ======= >>>>>>> 7e51f860b1 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= +======= +======= +======= +>>>>>>> 7c7dc18e8 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +======= +>>>>>>> locationtech-main case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) >>>>>>> 08d14c1e3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -28279,6 +28499,7 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bbf7cc3b06 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD >>>>>>> b62f2f9ee6 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -28392,9 +28613,38 @@ object KafkaCacheLoader extends LazyLogging { ======= ======= ======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= + case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() +>>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +>>>>>>> d42d16549 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +======= +>>>>>>> af7a3e028 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> ad15fc9fe (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= + case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() +>>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 7c7dc18e8 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a62b956fb6 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> bbc8576d19 (GEOMESA-3100 Kafka layer views (#2784)) @@ -29616,6 +29866,13 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> 7103b25bb7 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +======= +>>>>>>> c82e069f2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= <<<<<<< HEAD >>>>>>> 6055a8bb0 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -29631,13 +29888,17 @@ object KafkaCacheLoader extends LazyLogging { <<<<<<< HEAD >>>>>>> bbf7cc3b0 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 539ff4f7e7 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -29646,14 +29907,21 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) >>>>>>> 93cedd7b3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 89d0a858d2 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= ======= +>>>>>>> locationtech-main +======= ======= case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() >>>>>>> 60b8016be (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -29661,6 +29929,7 @@ object KafkaCacheLoader extends LazyLogging { >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c7b6fe2393 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -29672,6 +29941,13 @@ object KafkaCacheLoader extends LazyLogging { case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> ad15fc9fe (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= + case _: Clear => toLoad.cache.fireClear(timestamp); cache.clear() +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main case m => throw new IllegalArgumentException(s"Unknown message: $m") } // once we've hit the max offset for the partition, remove from the offset map to indicate we're done diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStore.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStore.scala index 5a2d7a5f4c57..0947b049786c 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStore.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStore.scala @@ -76,6 +76,7 @@ import org.locationtech.geomesa.filter.factory.FastFilterFactory <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 65a3a6e36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -221,9 +222,14 @@ import org.locationtech.geomesa.filter.factory.FastFilterFactory >>>>>>> 1e11ed51a6 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) @@ -237,6 +243,7 @@ import org.locationtech.geomesa.filter.factory.FastFilterFactory <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 581f1dd15 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -342,6 +349,8 @@ import org.locationtech.geomesa.filter.factory.FastFilterFactory >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.index.FlushableFeatureWriter ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) @@ -350,6 +359,7 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5ca0cd6de5 (GEOMESA-3100 Kafka layer views (#2784)) import org.locationtech.geomesa.index.FlushableFeatureWriter ======= @@ -1925,12 +1935,18 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter <<<<<<< HEAD ======= >>>>>>> 5dc1f86700 (GEOMESA-3100 Kafka layer views (#2784)) +======= +import org.locationtech.geomesa.index.FlushableFeatureWriter +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= import org.locationtech.geomesa.index.FlushableFeatureWriter ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2088,6 +2104,8 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter >>>>>>> bddfdbea54 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 58286bfd3 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -2115,6 +2133,7 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6f6887eb8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -2373,11 +2392,14 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bbc8576d19 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -4387,6 +4409,8 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter ======= >>>>>>> fae9296238 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.index.FlushableFeatureWriter ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) @@ -4395,6 +4419,7 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4436,11 +4461,17 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter >>>>>>> 626c8f9b93 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.index.FlushableFeatureWriter ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 19aa61c0de (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -4462,10 +4493,17 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter ======= ======= ======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4475,12 +4513,15 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter >>>>>>> f4b2369e9a (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> locationtech-main +======= import org.locationtech.geomesa.index.FlushableFeatureWriter ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 305a9263eb (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> location-main ======= @@ -5108,6 +5149,11 @@ import org.locationtech.geomesa.index.FlushableFeatureWriter import org.locationtech.geomesa.index.FlushableFeatureWriter >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +import org.locationtech.geomesa.index.FlushableFeatureWriter +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main import org.locationtech.geomesa.index.geotools.GeoMesaDataStoreFactory.NamespaceConfig import org.locationtech.geomesa.index.geotools.{GeoMesaFeatureReader, MetadataBackedDataStore} import org.locationtech.geomesa.index.metadata.GeoMesaMetadata @@ -5190,6 +5236,7 @@ import org.opengis.filter.Filter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 65a3a6e36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -5746,11 +5793,14 @@ import org.opengis.filter.Filter ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1bfc4f74c8 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) @@ -5770,6 +5820,8 @@ import org.opengis.filter.Filter ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> locationtech-main >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -5779,6 +5831,7 @@ import org.opengis.filter.Filter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -6152,6 +6205,8 @@ import org.opengis.filter.Filter ======= <<<<<<< HEAD >>>>>>> fa049272d1 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main import java.io.{Closeable, IOException} ======= <<<<<<< HEAD @@ -6160,6 +6215,7 @@ import java.io.{Closeable, IOException} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6196,6 +6252,8 @@ import java.io.{Closeable, IOException} >>>>>>> 5ca0cd6de5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD @@ -6226,6 +6284,7 @@ import java.io.{Closeable, IOException} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -6292,6 +6351,11 @@ import java.io.{Closeable, IOException} >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) @@ -6306,6 +6370,7 @@ import java.io.{Closeable, IOException} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6f6887eb8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -6327,6 +6392,8 @@ import java.io.{Closeable, IOException} ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) @@ -6338,6 +6405,7 @@ import java.io.{Closeable, IOException} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e7f3e6588 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -6357,6 +6425,8 @@ import java.io.{Closeable, IOException} ======= >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) @@ -6368,6 +6438,7 @@ import java.io.{Closeable, IOException} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e0773a1bd7 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -6379,10 +6450,13 @@ import java.io.{Closeable, IOException} ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) @@ -7709,6 +7783,11 @@ import java.io.{Closeable, IOException} import java.io.{Closeable, IOException, StringReader} ======= import java.io.{Closeable, IOException} +======= +import java.io.{Closeable, IOException, StringReader} +======= +import java.io.{Closeable, IOException} +>>>>>>> locationtech-main >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD @@ -7718,6 +7797,7 @@ import java.io.{Closeable, IOException} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 95c83ca7fa (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -7735,6 +7815,10 @@ import java.io.{Closeable, IOException} >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> c32560b0f3 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) @@ -7744,6 +7828,7 @@ import java.io.{Closeable, IOException} >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5f83b35214 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -8706,6 +8791,8 @@ import java.io.{Closeable, IOException} ======= >>>>>>> fa049272d1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> 58286bfd3 (GEOMESA-3100 Kafka layer views (#2784)) @@ -8716,6 +8803,7 @@ import java.io.{Closeable, IOException} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -9034,11 +9122,16 @@ import java.io.{Closeable, IOException} >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 28427dfd8f (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -10614,6 +10707,12 @@ import java.io.{Closeable, IOException} >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -10625,6 +10724,7 @@ import java.io.{Closeable, IOException} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a62b956fb6 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> bbc8576d19 (GEOMESA-3100 Kafka layer views (#2784)) @@ -11172,6 +11272,15 @@ import java.io.{Closeable, IOException} import java.io.{Closeable, IOException, StringReader} >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +import java.io.{Closeable, IOException, StringReader} +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main import java.util.concurrent.{ConcurrentHashMap, ScheduledExecutorService} import java.util.{Collections, Properties, UUID} import scala.concurrent.duration.Duration @@ -11186,6 +11295,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ) extends MetadataBackedDataStore(config) with HasGeoMesaStats with ZookeeperLocking { >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) @@ -11305,6 +11415,11 @@ class KafkaDataStore( ) extends MetadataBackedDataStore(config) with HasGeoMesaStats with ZookeeperLocking { >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= + ) extends MetadataBackedDataStore(config) with HasGeoMesaStats with ZookeeperLocking { +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main import KafkaDataStore.TopicKey import org.apache.kafka.clients.producer.ProducerConfig.TRANSACTIONAL_ID_CONFIG @@ -11388,6 +11503,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 5f83b35214 (GEOMESA-3100 Kafka layer views (#2784)) @@ -12703,11 +12819,14 @@ class KafkaDataStore( ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> fc2f65fc3 (GEOMESA-3198 Kafka streams integration (#2854)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e559bce036 (GEOMESA-3198 Kafka streams integration (#2854)) ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) @@ -12854,6 +12973,12 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -12862,6 +12987,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -12929,6 +13055,8 @@ class KafkaDataStore( >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> e559bce036 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main >>>>>>> 4e12cd412 (GEOMESA-3198 Kafka streams integration (#2854)) ======= ======= @@ -12941,6 +13069,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f4b2369e9a (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -12962,6 +13091,8 @@ class KafkaDataStore( >>>>>>> locationtech-main ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d657014c8 (GEOMESA-3198 Kafka streams integration (#2854)) @@ -12971,6 +13102,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 626c8f9b93 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -13008,12 +13140,19 @@ class KafkaDataStore( >>>>>>> a53bfd6caf (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +======= +>>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 4e12cd412 (GEOMESA-3198 Kafka streams integration (#2854)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fc2f65fc3 (GEOMESA-3198 Kafka streams integration (#2854)) <<<<<<< HEAD <<<<<<< HEAD @@ -13034,6 +13173,9 @@ class KafkaDataStore( >>>>>>> fae9296238 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +>>>>>>> fc2f65fc3 (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main +======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -13041,6 +13183,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14784,6 +14927,8 @@ class KafkaDataStore( >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main @volatile private var producerInitialized = false @@ -14851,6 +14996,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 4bb2f200fc (GEOMESA-3100 Kafka layer views (#2784)) @@ -15873,6 +16019,13 @@ class KafkaDataStore( ======= >>>>>>> fe3378ccaa (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> fc2f65fc3 (GEOMESA-3198 Kafka streams integration (#2854)) @@ -15884,6 +16037,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -16195,6 +16349,12 @@ class KafkaDataStore( ======= >>>>>>> 79f56900f0 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) ======= >>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) @@ -16222,6 +16382,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c32560b0f3 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -16614,6 +16775,13 @@ class KafkaDataStore( >>>>>>> locationtech-main ======= ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main +======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> 4e12cd412 (GEOMESA-3198 Kafka streams integration (#2854)) <<<<<<< HEAD @@ -16631,6 +16799,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6f6887eb8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -16995,6 +17164,18 @@ class KafkaDataStore( >>>>>>> locationtech-main ======= ======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> d657014c8 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -17004,6 +17185,9 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main ======= @@ -17013,6 +17197,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 4f4ecaeb43 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -19147,6 +19332,14 @@ class KafkaDataStore( ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main // only instantiate the producer if needed private val defaultProducer = new LazyProducer(KafkaDataStore.producer(config.brokers, config.producers.properties)) // noinspection ScalaDeprecation @@ -19177,6 +19370,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -20386,6 +20580,8 @@ class KafkaDataStore( >>>>>>> e559bce036 (GEOMESA-3198 Kafka streams integration (#2854)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main // view type name -> actual type name private val layerViewLookup = @@ -20473,9 +20669,20 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= ======= ======= +======= + + // migrate old schemas, if any + if (!metadata.read("migration", "check").exists(_.toBoolean)) { + new MetadataMigration(this, config.catalog, config.zookeepers).run() + metadata.insert("migration", "check", "true") + } +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main // migrate old schemas, if any if (!metadata.read("migration", "check").exists(_.toBoolean)) { @@ -20831,6 +21038,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1a5f68233 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -21028,6 +21236,8 @@ class KafkaDataStore( >>>>>>> 7a3c0ae880 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> ec6d06b576 (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main override private[geomesa] def getFeatureReader( ======= @@ -21035,6 +21245,7 @@ class KafkaDataStore( ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD @@ -21054,6 +21265,9 @@ class KafkaDataStore( ======= >>>>>>> locationtech-main ======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) @@ -21064,6 +21278,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 23a7d9849f (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -21150,9 +21365,12 @@ class KafkaDataStore( >>>>>>> 58d14a257 (GEOMESA-3254 Add Bloop build support) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') private[geomesa] def getFeatureReader( >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -21172,6 +21390,8 @@ class KafkaDataStore( <<<<<<< HEAD >>>>>>> location-main ======= +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main sft: SimpleFeatureType, transaction: Transaction, @@ -21179,6 +21399,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -22179,6 +22400,9 @@ class KafkaDataStore( <<<<<<< HEAD ======= >>>>>>> a21ce6ee58 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main override def getFeatureReader(query: Query, transaction: Transaction): SimpleFeatureReader = { val sft = getSchema(query.getTypeName) if (sft == null) { @@ -22230,6 +22454,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -23010,9 +23235,16 @@ class KafkaDataStore( <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> 222e44653b (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -26677,6 +26909,12 @@ class KafkaDataStore( ======= ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -26693,6 +26931,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -26704,6 +26943,11 @@ class KafkaDataStore( >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 6f6887eb8 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -26711,6 +26955,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6f6887eb8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -26719,12 +26964,21 @@ class KafkaDataStore( >>>>>>> locationtech-main ======= ======= +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main +======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -26747,12 +27001,17 @@ class KafkaDataStore( >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> d2002b5af (GEOMESA-3100 Kafka layer views (#2784)) @@ -26813,6 +27072,8 @@ class KafkaDataStore( ======= >>>>>>> 3be8d2a5a4 (Merge branch 'feature/postgis-fixes') >>>>>>> 34472778d3 (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // kick off the kafka consumers for this sft, if not already started caches.get(layerViewLookup.getOrElse(query.getTypeName, query.getTypeName)) @@ -26828,6 +27089,11 @@ class KafkaDataStore( s"Schema '${sft.getTypeName}' is a read-only view of '${layerViewLookup(sft.getTypeName)}'") <<<<<<< HEAD <<<<<<< HEAD +======= +======= +>>>>>>> locationtech-main +<<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -26955,6 +27221,8 @@ class KafkaDataStore( ======= ======= >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main new KafkaFeatureStore(this, sft, runner, cache(typeName)) } @@ -26967,6 +27235,7 @@ class KafkaDataStore( caches.get(layerViewLookup.getOrElse(query.getTypeName, query.getTypeName)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD GeoMesaFeatureReader(sft, query, runner, None, config.audit) ======= @@ -26995,6 +27264,11 @@ class KafkaDataStore( >>>>>>> 8ed2c9f7e5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 06956ccf98 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= + GeoMesaFeatureReader(sft, query, runner, None, config.audit) + } + >>>>>>> locationtech-main ======= >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) @@ -27004,6 +27278,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -27020,12 +27295,15 @@ class KafkaDataStore( >>>>>>> 69e3273ac1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 17f13b3a7 (GEOMESA-3100 Kafka layer views (#2784)) @@ -27119,6 +27397,8 @@ class KafkaDataStore( } >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main override def getFeatureWriter(typeName: String, filter: Filter, transaction: Transaction): KafkaFeatureWriter = { val sft = getSchema(typeName) if (sft == null) { @@ -27146,6 +27426,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c57b5f538 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -27196,6 +27477,8 @@ class KafkaDataStore( >>>>>>> 305a9263eb (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) @@ -27203,6 +27486,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -27283,6 +27567,10 @@ class KafkaDataStore( >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> ae5eea67f1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD @@ -27291,6 +27579,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e7bfe001d (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -27300,6 +27589,8 @@ class KafkaDataStore( >>>>>>> 649f2f9c22 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -27312,6 +27603,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 23a7d9849f (GEOMESA-3100 Kafka layer views (#2784)) @@ -27485,6 +27777,12 @@ class KafkaDataStore( ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main } val producer = getTransactionalProducer(sft, transaction) ======= @@ -31189,6 +31487,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD @@ -31475,6 +31774,8 @@ class KafkaDataStore( ======= >>>>>>> c7b6fe2393 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) @@ -31558,6 +31859,7 @@ class KafkaDataStore( <<<<<<< HEAD >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a21ce6ee58 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -31577,11 +31879,21 @@ class KafkaDataStore( >>>>>>> 3cc095bb5c (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -31593,6 +31905,13 @@ class KafkaDataStore( >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> c7b6fe2393 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main val writer = if (sft.isVisibilityRequired) { new AppendKafkaFeatureWriter(sft, producer, config.serialization) with RequiredVisibilityWriter @@ -31603,6 +31922,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -32076,6 +32396,11 @@ class KafkaDataStore( ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main writer.clear() } writer @@ -32100,6 +32425,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -32183,6 +32509,9 @@ class KafkaDataStore( ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main private def getTransactionalProducer(sft: SimpleFeatureType, transaction: Transaction): KafkaFeatureProducer = { val useDefaultPartitioning = KafkaDataStore.usesDefaultPartitioning(sft) @@ -32192,6 +32521,7 @@ class KafkaDataStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f01ac238e (GEOMESA-3198 Kafka streams integration (#2854)) ======= @@ -32205,6 +32535,8 @@ class KafkaDataStore( >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main if (transaction == null || transaction == Transaction.AUTO_COMMIT) { val producer = if (useDefaultPartitioning) { defaultProducer.instance } else { partitionedProducer.instance } ======= diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreFactory.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreFactory.scala index e3d3ba6bd518..bd129cd2e964 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreFactory.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreFactory.scala @@ -38,6 +38,7 @@ import java.io.IOException <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -94,6 +95,9 @@ import java.io.IOException ======= ======= >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main import pureconfig.{ConfigCursor, ConfigReader, Derivation} import java.awt.RenderingHints @@ -101,6 +105,7 @@ import java.io.{IOException, Serializable} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -195,6 +200,9 @@ import java.io.IOException ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main import scala.concurrent.duration.Duration import scala.reflect.ClassTag import scala.util.control.NonFatal @@ -260,6 +268,7 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD val DefaultCatalog: String = "geomesa-catalog" ======= @@ -346,6 +355,12 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { ======= val DefaultCatalog: String = "geomesa-catalog" >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= + val DefaultCatalog: String = org.locationtech.geomesa.kafka.data.DefaultCatalog + val DefaultZkPath: String = org.locationtech.geomesa.kafka.data.DefaultZkPath +======= + val DefaultCatalog: String = "geomesa-catalog" +>>>>>>> locationtech-main ======= private val LayerViewReader = Derivation.Successful(ConfigReader.fromCursor(readLayerViewConfig)) private val LayerViewClassTag = ClassTag[LayerViewConfig](classOf[LayerViewConfig]) @@ -353,6 +368,7 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17f13b3a7a (GEOMESA-3100 Kafka layer views (#2784)) val DefaultZkPath: String = "geomesa/ds/kafka" <<<<<<< HEAD @@ -549,6 +565,10 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { val DefaultZkPath: String = "geomesa/ds/kafka" >>>>>>> 17f13b3a7a (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= + val DefaultZkPath: String = "geomesa/ds/kafka" +>>>>>>> 17f13b3a7a (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main override val DisplayName = "Kafka (GeoMesa)" override val Description = "Apache Kafka\u2122 distributed log" @@ -852,6 +872,7 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -908,6 +929,9 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { ======= ======= >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main pureconfig.loadConfigOrThrow[LayerViewConfig](c.toConfig)(LayerViewClassTag, LayerViewReader) } } @@ -915,6 +939,7 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -1009,6 +1034,9 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main val typeNames = configs.toSeq.flatMap(_._2.map(_.typeName)) if (typeNames != typeNames.distinct) { throw new IllegalArgumentException( @@ -1019,6 +1047,7 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= configs >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1138,6 +1167,11 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { configs >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= + configs +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main } } @@ -1205,6 +1239,7 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1317,6 +1352,10 @@ object KafkaDataStoreFactory extends GeoMesaDataStoreInfo with LazyLogging { ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main * Gets up a zk path parameter - trims, removes leading/trailing "/" if needed * * @param params data store params diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreParams.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreParams.scala index 77dd0ffa55e4..a80197760145 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreParams.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreParams.scala @@ -22,6 +22,7 @@ import org.locationtech.geomesa.utils.index.SizeSeparatedBucketIndex <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import java.util.concurrent.ScheduledExecutorService import java.util.{Locale, Properties} ======= @@ -122,6 +123,14 @@ import java.util.Properties import java.util.concurrent.ScheduledExecutorService >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +import java.util.concurrent.ScheduledExecutorService +import java.util.{Locale, Properties} +======= +import java.util.Properties +import java.util.concurrent.ScheduledExecutorService +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main import scala.concurrent.duration.Duration <<<<<<< HEAD @@ -497,6 +506,7 @@ trait KafkaDataStoreParamsWTF extends NamespaceParams { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -609,6 +619,10 @@ trait KafkaDataStoreParamsWTF extends NamespaceParams { ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main val LayerViews = new GeoMesaParam[String]( "kafka.layer.views", diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaFeatureStore.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaFeatureStore.scala index 8f8d44163743..b7b41914dfa9 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaFeatureStore.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/KafkaFeatureStore.scala @@ -22,6 +22,7 @@ class KafkaFeatureStore(ds: KafkaDataStore, sft: SimpleFeatureType, listeners: K <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -89,12 +90,15 @@ class KafkaFeatureStore(ds: KafkaDataStore, sft: SimpleFeatureType, runner: Quer ======= >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= class KafkaFeatureStore(ds: KafkaDataStore, sft: SimpleFeatureType, runner: QueryRunner, listeners: KafkaListeners) extends GeoMesaFeatureStore(ds, sft, runner) { >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -156,6 +160,8 @@ class KafkaFeatureStore(ds: KafkaDataStore, sft: SimpleFeatureType, runner: Quer >>>>>>> locationtech-main ======= >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main override def removeFeatures(filter: Filter): Unit = filter match { case Filter.INCLUDE => clearFeatures() diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/package.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/package.scala index aecaee8d2968..1cc9c64c67fa 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/package.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/data/package.scala @@ -46,6 +46,7 @@ import org.apache.kafka.clients.producer.Producer <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 73f3a8cb6 (GEOMESA-3198 Kafka streams integration (#2854)) ======= @@ -142,6 +143,8 @@ import org.apache.kafka.clients.producer.Producer >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.concurrent.LazyCloseable ======= <<<<<<< HEAD diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureStateFactory.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureStateFactory.scala index 3957f219af0a..d2073a6a0525 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureStateFactory.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/FeatureStateFactory.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.kafka.index <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -165,11 +166,16 @@ import java.util.concurrent.{ScheduledExecutorService, ScheduledFuture, Schedule >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import java.io.Closeable import java.util.Date import java.util.concurrent.{ScheduledExecutorService, ScheduledFuture, ScheduledThreadPoolExecutor, TimeUnit} >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +<<<<<<< HEAD >>>>>>> 8252893b4e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main import com.github.benmanes.caffeine.cache.Ticker import com.typesafe.scalalogging.LazyLogging import org.geotools.filter.text.ecql.ECQL diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheImpl.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheImpl.scala index ff40b7e3771c..0865162a2c2b 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheImpl.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheImpl.scala @@ -141,6 +141,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8e36ec0d0 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -308,6 +309,8 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -317,6 +320,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -430,6 +434,8 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -444,6 +450,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -524,6 +531,8 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= >>>>>>> 531c6d9870 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> a1258aa46 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= @@ -533,6 +542,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -565,6 +575,8 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) @@ -583,6 +595,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -620,6 +633,8 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= @@ -627,6 +642,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -648,6 +664,11 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= <<<<<<< HEAD >>>>>>> locationtech-main +======= +======= +======= +<<<<<<< HEAD +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -664,6 +685,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -715,11 +737,14 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= >>>>>>> 531c6d9870 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> a1258aa46 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -731,12 +756,15 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -748,6 +776,8 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -768,6 +798,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -791,19 +822,25 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> c7b6fe2393 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -11095,6 +11132,17 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi logger.debug(s"Initialized KafkaFeatureCache with factory $factory and support $support") ======= +======= +======= +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) + logger.debug(s"Initialized KafkaFeatureCache with factory $factory and support $support") + +======= +>>>>>>> locationtech-main >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD @@ -11115,6 +11163,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bddfdbea54 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> a1258aa460 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -12365,6 +12414,10 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) @@ -12393,6 +12446,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 429ffc55e (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -17536,6 +17590,8 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 370b3c0913 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> a1258aa46 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD @@ -17584,6 +17640,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD @@ -17675,6 +17732,12 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 843ec0804f (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -17702,6 +17765,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD @@ -18040,6 +18104,10 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> c32560b0f3 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -18059,6 +18127,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d0dc799ff1 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 808743e257 (GEOMESA-3100 Kafka layer views (#2784)) @@ -18546,6 +18615,12 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= ======= ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> a1258aa46 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD @@ -18561,6 +18636,7 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -18600,12 +18676,22 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= ======= ======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= +======= >>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 890b70c86 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e21d61704 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD >>>>>>> 8ec80cd12d (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -19554,9 +19640,14 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= ======= ======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -19571,9 +19662,16 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi ======= ======= ======= +>>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> c8421ce4b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 306621fc40 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= @@ -19587,10 +19685,24 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main ======= logger.debug(s"Initialized KafkaFeatureCache with factory $factory and support $support") >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +<<<<<<< HEAD >>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> e7ad661fa7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -19599,6 +19711,25 @@ class KafkaFeatureCacheImpl(sft: SimpleFeatureType, config: IndexConfig, layerVi >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 4d37d5ef5 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> f7038468b (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= + logger.debug(s"Initialized KafkaFeatureCache with factory $factory and support $support") + +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main /** * Note: this method is not thread-safe. The `state` and `index` can get out of sync if the same feature * is updated simultaneously from two different threads diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheView.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheView.scala index 938d0d450dc1..6a15583457d1 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheView.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheView.scala @@ -54,6 +54,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -727,12 +728,18 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= + * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. +======= +<<<<<<< HEAD +>>>>>>> locationtech-main ======= ======= >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) @@ -740,6 +747,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -753,6 +762,7 @@ >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD @@ -1245,6 +1255,8 @@ >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1274,6 +1286,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1bfc4f74c8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1308,11 +1321,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1332,6 +1349,8 @@ >>>>>>> 12fe94b860 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1348,6 +1367,7 @@ <<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0e42c51dc0 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -1384,9 +1404,12 @@ <<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= +<<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> ffbc2ce32a (GEOMESA-3100 Kafka layer views (#2784)) @@ -1402,12 +1425,18 @@ >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +>>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fa68dd43c6 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> de8804123e (GEOMESA-3100 Kafka layer views (#2784)) @@ -1428,11 +1457,16 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -1441,6 +1475,7 @@ >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +<<<<<<< HEAD >>>>>>> c2a94543ba (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -1494,6 +1529,10 @@ >>>>>>> 885a095ca8 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 0e1c98d0b5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= @@ -1509,6 +1548,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1805,6 +1845,8 @@ ======= >>>>>>> 0e1c98d0b5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> a0314fb7f (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -1824,6 +1866,7 @@ <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1835,6 +1878,8 @@ <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1848,6 +1893,7 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -1905,6 +1951,8 @@ >>>>>>> dcd54df39d (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> 58286bfd3 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1916,6 +1964,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -1963,19 +2012,32 @@ <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1984,6 +2046,8 @@ ======= >>>>>>> c44e474495 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) @@ -1992,6 +2056,7 @@ >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ffbc2ce32a (GEOMESA-3100 Kafka layer views (#2784)) @@ -2002,6 +2067,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -2010,6 +2077,7 @@ >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> fa68dd43c6 (GEOMESA-3100 Kafka layer views (#2784)) @@ -2020,10 +2088,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -2039,6 +2110,9 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) @@ -2047,6 +2121,7 @@ >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c57b5f538a (GEOMESA-3100 Kafka layer views (#2784)) @@ -2057,12 +2132,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 88ef67cdfe (GEOMESA-3100 Kafka layer views (#2784)) @@ -2073,10 +2151,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -2092,6 +2173,9 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') @@ -2099,6 +2183,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= @@ -5993,6 +6078,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaListeners.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaListeners.scala index ebb8071dc363..98e980fbd7f8 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaListeners.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/index/KafkaListeners.scala @@ -54,6 +54,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -727,12 +728,18 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= + * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. +======= +<<<<<<< HEAD +>>>>>>> locationtech-main ======= ======= >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) @@ -740,6 +747,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -753,6 +762,7 @@ >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD @@ -1245,6 +1255,8 @@ >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1274,6 +1286,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1bfc4f74c8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1308,11 +1321,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1332,6 +1349,8 @@ >>>>>>> 12fe94b860 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1348,6 +1367,7 @@ <<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0e42c51dc0 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -1384,9 +1404,12 @@ <<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= +<<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> ffbc2ce32a (GEOMESA-3100 Kafka layer views (#2784)) @@ -1402,12 +1425,18 @@ >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +>>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fa68dd43c6 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> de8804123e (GEOMESA-3100 Kafka layer views (#2784)) @@ -1428,11 +1457,16 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -1441,6 +1475,7 @@ >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +<<<<<<< HEAD >>>>>>> c2a94543ba (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -1494,6 +1529,10 @@ >>>>>>> 885a095ca8 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 0e1c98d0b5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= @@ -1509,6 +1548,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1805,6 +1845,8 @@ ======= >>>>>>> 0e1c98d0b5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> a0314fb7f (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -1824,6 +1866,7 @@ <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1835,6 +1878,8 @@ <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1848,6 +1893,7 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -1905,6 +1951,8 @@ >>>>>>> dcd54df39d (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> 58286bfd3 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1916,6 +1964,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -1963,19 +2012,32 @@ <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1984,6 +2046,8 @@ ======= >>>>>>> c44e474495 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) @@ -1992,6 +2056,7 @@ >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ffbc2ce32a (GEOMESA-3100 Kafka layer views (#2784)) @@ -2002,6 +2067,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -2010,6 +2077,7 @@ >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> fa68dd43c6 (GEOMESA-3100 Kafka layer views (#2784)) @@ -2020,10 +2088,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -2039,6 +2110,9 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) @@ -2047,6 +2121,7 @@ >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c57b5f538a (GEOMESA-3100 Kafka layer views (#2784)) @@ -2057,12 +2132,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 88ef67cdfe (GEOMESA-3100 Kafka layer views (#2784)) @@ -2073,10 +2151,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -2092,6 +2173,9 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') @@ -2099,6 +2183,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= @@ -5993,6 +6078,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/GeoMesaSerde.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/GeoMesaSerde.scala index acf49d0341e9..8e9291d91562 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/GeoMesaSerde.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/GeoMesaSerde.scala @@ -43,6 +43,7 @@ import org.locationtech.geomesa.kafka.streams.GeoMesaSerde.TypeSpecificSerde <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -110,12 +111,15 @@ import org.locationtech.geomesa.utils.io.CloseWithLogging ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) ======= +>>>>>>> locationtech-main +======= import org.locationtech.geomesa.kafka.streams.GeoMesaSerde.GeoMesaSerializer import org.locationtech.geomesa.utils.io.CloseWithLogging >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -177,6 +181,8 @@ import org.locationtech.geomesa.utils.io.CloseWithLogging >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main /** * Serde for reading and writing to GeoMesa Kafka topics @@ -228,6 +234,7 @@ class GeoMesaSerde <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -410,6 +417,9 @@ class GeoMesaSerde extends Serde[GeoMesaMessage] with HasTopicMetadata { ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main class GeoMesaSerde extends Serde[GeoMesaMessage] with HasTopicMetadata { private val impl = new GeoMesaSerializer() @@ -428,6 +438,7 @@ class GeoMesaSerde extends Serde[GeoMesaMessage] with HasTopicMetadata { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -461,6 +472,8 @@ class GeoMesaSerde extends Serde[GeoMesaMessage] with HasTopicMetadata { >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main } object GeoMesaSerde { @@ -485,6 +498,7 @@ object GeoMesaSerde { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -541,6 +555,9 @@ object GeoMesaSerde { ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main class GeoMesaSerializer extends Serializer[GeoMesaMessage] with Deserializer[GeoMesaMessage] with HasTopicMetadata { // track serialization/deserialization separately to avoid cache thrashing @@ -569,6 +586,7 @@ object GeoMesaSerde { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) ======= <<<<<<< HEAD @@ -666,6 +684,9 @@ object GeoMesaSerde { ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main override def close(): Unit = {} } } diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/GeoMesaStreamsBuilder.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/GeoMesaStreamsBuilder.scala index b7a1a07305d8..08a4d6ace621 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/GeoMesaStreamsBuilder.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/GeoMesaStreamsBuilder.scala @@ -42,6 +42,7 @@ import org.apache.kafka.common.serialization.Serde <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) ======= @@ -154,6 +155,10 @@ import org.apache.kafka.common.serialization.Serde ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main import org.apache.kafka.streams.Topology import org.apache.kafka.streams.Topology.AutoOffsetReset import org.apache.kafka.streams.kstream.GlobalKTable @@ -180,6 +185,7 @@ class GeoMesaStreamsBuilder( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -246,6 +252,8 @@ class GeoMesaStreamsBuilder( >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main ======= val serde: GeoMesaSerde, val timestampExtractor: TimestampExtractor, @@ -253,6 +261,7 @@ class GeoMesaStreamsBuilder( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -314,6 +323,8 @@ class GeoMesaStreamsBuilder( >>>>>>> locationtech-main ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> locationtech-main resetPolicy: Option[AutoOffsetReset]) { import org.apache.kafka.streams.scala.Serdes.String @@ -338,6 +349,7 @@ class GeoMesaStreamsBuilder( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) ======= @@ -450,6 +462,10 @@ class GeoMesaStreamsBuilder( ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main * Create a stream of updates for a given feature type * * @param typeName feature type name @@ -654,6 +670,7 @@ object GeoMesaStreamsBuilder { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -737,6 +754,9 @@ object GeoMesaStreamsBuilder { ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main streamsBuilder: StreamsBuilder): GeoMesaStreamsBuilder = { val jParams = params.asJava val serde = new GeoMesaSerde() @@ -746,6 +766,7 @@ object GeoMesaStreamsBuilder { val reset = Option(resetPolicy).orElse(resetConfig(jParams)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) <<<<<<< HEAD ======= @@ -814,6 +835,9 @@ object GeoMesaStreamsBuilder { ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main new GeoMesaStreamsBuilder(builder, serde, timestamps, reset) } diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/package.scala b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/package.scala index 30688f8cf9b2..f22d79ffc2ca 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/package.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/main/scala/org/locationtech/geomesa/kafka/streams/package.scala @@ -61,6 +61,7 @@ package object streams { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -122,6 +123,9 @@ package object streams { ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main * Data model for a GeoMesa data store message, used as the value in a Kafka record * * @param action message action @@ -170,6 +174,7 @@ package object streams { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) ======= <<<<<<< HEAD @@ -261,6 +266,9 @@ package object streams { ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main * Trait for provided metadata about a feature type topic */ trait HasTopicMetadata { @@ -370,6 +378,7 @@ package object streams { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= val internal = ds.serialization(sft, ds.config.serialization, `lazy` = false).serializer >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) @@ -489,6 +498,11 @@ package object streams { val internal = ds.serialization(sft, ds.config.serialization, `lazy` = false).serializer >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= + val internal = ds.serialization(sft, ds.config.serialization, `lazy` = false).serializer +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main return new GeoMesaMessageSerializer(sft, internal) case t => topics += t @@ -552,6 +566,7 @@ package object streams { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= GeoMesaMessage.upsert(feature.getAttributes.asScala, userData) >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) @@ -671,6 +686,11 @@ package object streams { GeoMesaMessage.upsert(feature.getAttributes.asScala, userData) >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= + GeoMesaMessage.upsert(feature.getAttributes.asScala, userData) +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main } } @@ -696,6 +716,7 @@ package object streams { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * * @see [[org.locationtech.geomesa.features.avro.AvroSimpleFeatureWriter#write]] >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) @@ -815,6 +836,11 @@ package object streams { * * @see [[org.locationtech.geomesa.features.avro.AvroSimpleFeatureWriter#write]] >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= + * * @see [[org.locationtech.geomesa.features.avro.AvroSimpleFeatureWriter#write]] +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main * * @param converters attribute converters to enforce feature type schema * @param attributes message attributes diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreTest.scala b/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreTest.scala index 60541182f46e..4ae0d3d20d02 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreTest.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/data/KafkaDataStoreTest.scala @@ -27,6 +27,7 @@ package org.locationtech.geomesa.kafka.data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> e1f939a3e (GEOMESA-3100 Kafka layer views (#2784)) @@ -370,6 +371,11 @@ package org.locationtech.geomesa.kafka.data <<<<<<< HEAD ======= >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +<<<<<<< HEAD +======= +>>>>>>> locationtech-main import java.nio.charset.StandardCharsets import java.util.concurrent.atomic.{AtomicBoolean, AtomicInteger} import java.util.concurrent.{CopyOnWriteArrayList, ScheduledExecutorService, SynchronousQueue, TimeUnit} @@ -418,6 +424,7 @@ import java.util.{Collections, Date} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1316,10 +1323,13 @@ import java.util.{Collections, Date} ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 54ece16d15 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -1849,8 +1859,13 @@ import com.typesafe.scalalogging.LazyLogging ======= ======= ======= +>>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -2787,6 +2802,8 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> 9a5d6d2815 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> f4b2369e9a (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -2811,8 +2828,11 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> locationtech-main >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -2826,12 +2846,16 @@ import com.typesafe.scalalogging.LazyLogging >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -2854,6 +2878,10 @@ import com.typesafe.scalalogging.LazyLogging import com.typesafe.scalalogging.LazyLogging >>>>>>> 17f13b3a7a (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +import com.typesafe.scalalogging.LazyLogging +>>>>>>> 17f13b3a7a (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main import kafka.admin.ConfigCommand.{ConfigEntity, Entity} import kafka.zk.{AdminZkClient, KafkaZkClient} ======= @@ -3473,6 +3501,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) ======= @@ -3585,6 +3614,10 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +======= +>>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +>>>>>>> locationtech-main val store = consumer.getFeatureSource(sft.getTypeName) // start the consumer polling val f0 = ScalaSimpleFeature.create(sft, "sm", "[\"smith1\",\"smith2\"]", 30, "2017-01-01T00:00:00.000Z", "POINT (0 0)") @@ -3599,6 +3632,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= val q = new Query(sft.getTypeName) >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) @@ -3718,6 +3752,11 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { val q = new Query(sft.getTypeName) >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +======= + val q = new Query(sft.getTypeName) +>>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +>>>>>>> locationtech-main eventually(40, 100.millis)(SelfClosingIterator(store.getFeatures.features).toSeq must containTheSameElementsAs(Seq(f0, f1))) } finally { @@ -3777,6 +3816,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) ======= @@ -3889,6 +3929,10 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= >>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) >>>>>>> 11b6e79a03 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +======= +======= +>>>>>>> 865887e96 (GEOMESA-3217,GEOMESA-3216 Support Postgis json attributes, top-level arrays in json) +>>>>>>> locationtech-main "expire entries" >> { foreach(Seq(true, false)) { cqEngine => val executor = mock[ScheduledExecutorService] @@ -4297,6 +4341,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0185d52d3 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= @@ -4341,6 +4386,94 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { >>>>>>> locationtech-main ======= >>>>>>> ea5bb37862 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= + "support listeners without indexing" >> { + val params = Map(KafkaDataStoreParams.CacheExpiry.getName -> "0s") + val (producer, consumer, sft) = createStorePair("listenersNonIndexing", params) + try { + val id = "fid-0" + val numUpdates = 1 + val maxLon = 80.0 + + var latestLon = -1.0 + var count = 0 + + val listener = new FeatureListener { + override def changed(event: FeatureEvent): Unit = { + val feature = event.asInstanceOf[KafkaFeatureChanged].feature + feature.getID mustEqual id + latestLon = feature.getDefaultGeometry.asInstanceOf[Point].getX + count += 1 + } + } + + producer.createSchema(sft) + val consumerStore = consumer.getFeatureSource(sft.getTypeName) + consumerStore.addFeatureListener(listener) + + WithClose(producer.getFeatureWriterAppend(sft.getTypeName, Transaction.AUTO_COMMIT)) { writer => + (numUpdates to 1 by -1).foreach { i => + val ll = maxLon - maxLon / i + val sf = writer.next() + sf.setAttributes(Array[AnyRef]("smith", Int.box(30), new Date(), s"POINT ($ll $ll)")) + sf.getIdentifier.asInstanceOf[FeatureIdImpl].setID(id) + sf.getUserData.put(Hints.USE_PROVIDED_FID, java.lang.Boolean.TRUE) + writer.write() + } + } + + eventually(40, 100.millis)(count must beEqualTo(numUpdates)) + latestLon must be equalTo 0.0 + } finally { + consumer.dispose() + producer.dispose() + } + } + + "support listeners without indexing" >> { + val params = Map(KafkaDataStoreParams.CacheExpiry.getName -> "0s") + val (producer, consumer, sft) = createStorePair("listenersNonIndexing", params) + try { + val id = "fid-0" + val numUpdates = 1 + val maxLon = 80.0 + + var latestLon = -1.0 + var count = 0 + + val listener = new FeatureListener { + override def changed(event: FeatureEvent): Unit = { + val feature = event.asInstanceOf[KafkaFeatureChanged].feature + feature.getID mustEqual id + latestLon = feature.getDefaultGeometry.asInstanceOf[Point].getX + count += 1 + } + } + + producer.createSchema(sft) + val consumerStore = consumer.getFeatureSource(sft.getTypeName) + consumerStore.addFeatureListener(listener) + + WithClose(producer.getFeatureWriterAppend(sft.getTypeName, Transaction.AUTO_COMMIT)) { writer => + (numUpdates to 1 by -1).foreach { i => + val ll = maxLon - maxLon / i + val sf = writer.next() + sf.setAttributes(Array[AnyRef]("smith", Int.box(30), new Date(), s"POINT ($ll $ll)")) + sf.getIdentifier.asInstanceOf[FeatureIdImpl].setID(id) + sf.getUserData.put(Hints.USE_PROVIDED_FID, java.lang.Boolean.TRUE) + writer.write() + } + } + + eventually(40, 100.millis)(count must beEqualTo(numUpdates)) + latestLon must be equalTo 0.0 + } finally { + consumer.dispose() + producer.dispose() + } + } + +>>>>>>> locationtech-main "support listeners without indexing" >> { val params = Map(KafkaDataStoreParams.CacheExpiry.getName -> "0s") val (producer, consumer, sft) = createStorePair("listenersNonIndexing", params) @@ -4394,6 +4527,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7c0f257cef (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= @@ -4404,6 +4538,8 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { >>>>>>> e236a49854 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= >>>>>>> cfd0bdd9e8 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> locationtech-main "support listeners without indexing" >> { val params = Map(KafkaDataStoreParams.CacheExpiry.getName -> "0s") val (producer, consumer, sft) = createStorePair("listenersNonIndexing", params) @@ -4455,6 +4591,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 46554dec25 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) ======= @@ -4502,6 +4639,8 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= >>>>>>> 676a994502 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) >>>>>>> 8f1f84a66b (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main "support listeners without indexing" >> { val params = Map(KafkaDataStoreParams.CacheExpiry.getName -> "0s") @@ -4552,6 +4691,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7c0f257ce (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) @@ -6352,6 +6492,10 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main "support transactions" >> { val (producer, consumer, _) = createStorePair() try { @@ -6466,6 +6610,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 65a3a6e36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -7022,11 +7167,14 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1bfc4f74c8 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) @@ -7046,6 +7194,8 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> locationtech-main >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -7055,6 +7205,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -7428,6 +7579,8 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= <<<<<<< HEAD >>>>>>> fa049272d1 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> locationtech-main val (producer, consumer, _) = createStorePair("views", Map(KafkaDataStoreParams.LayerViews.key -> views)) ======= <<<<<<< HEAD @@ -7436,6 +7589,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7470,6 +7624,8 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5ca0cd6de (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD @@ -7501,6 +7657,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c1d0543aac (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -8139,11 +8296,16 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 28427dfd8f (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -8489,6 +8651,12 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -8502,6 +8670,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e0773a1bd7 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -9777,6 +9946,12 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main val (producer, consumer, _) = createStorePair(Map(KafkaDataStoreParams.LayerViews.key -> views)) ======= val (producer, consumer, _) = createStorePair("views", Map(KafkaDataStoreParams.LayerViews.key -> views)) @@ -9828,6 +10003,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 65a3a6e36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -13219,6 +13395,10 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> c32560b0f3 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) @@ -13237,6 +13417,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fa049272d1 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -13252,11 +13433,16 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 0df2f54242 (GEOMESA-3100 Kafka layer views (#2784)) ======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c32560b0f3 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -13273,9 +13459,16 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= ======= ======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a7e6d42087 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -13292,6 +13485,15 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { val (producer, consumer, _) = createStorePair(Map(KafkaDataStoreParams.LayerViews.key -> views)) >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +======= + val (producer, consumer, _) = createStorePair(Map(KafkaDataStoreParams.LayerViews.key -> views)) +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main try { val sft = SimpleFeatureTypes.createType("test", "name:String,age:Int,dtg:Date,*geom:Point:srid=4326") producer.createSchema(sft) @@ -13299,6 +13501,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13360,6 +13563,9 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= ======= >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main val (producer, consumer, _) = createStorePair("views", Map(KafkaDataStoreParams.LayerViews.key -> views)) try { val sft = SimpleFeatureTypes.createType("test", "name:String,age:Int,dtg:Date,*geom:Point:srid=4326") @@ -13367,6 +13573,7 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -13458,6 +13665,9 @@ class KafkaDataStoreTest extends KafkaContainerTest with Mockito { ======= >>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 59dea284e8 (GEOMESA-3100 Kafka layer views (#2784)) +======= +>>>>>>> af0a88eb1 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main val sft2 = SimpleFeatureTypes.createType("test2", "name:String,dtg:Date,*geom:Point:srid=4326") val sft3 = SimpleFeatureTypes.createType("test3", "derived:String,dtg:Date,*geom:Point:srid=4326") diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheViewTest.scala b/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheViewTest.scala index 6c27358cfc1e..685e76a72f37 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheViewTest.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/index/KafkaFeatureCacheViewTest.scala @@ -54,6 +54,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -727,12 +728,18 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= + * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. +======= +<<<<<<< HEAD +>>>>>>> locationtech-main ======= ======= >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) @@ -740,6 +747,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -753,6 +762,7 @@ >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD @@ -1245,6 +1255,8 @@ >>>>>>> b334981791 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1274,6 +1286,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1bfc4f74c8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1308,11 +1321,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1332,6 +1349,8 @@ >>>>>>> 12fe94b860 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1348,6 +1367,7 @@ <<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0e42c51dc0 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -1384,9 +1404,12 @@ <<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= +<<<<<<< HEAD >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> ffbc2ce32a (GEOMESA-3100 Kafka layer views (#2784)) @@ -1402,12 +1425,18 @@ >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= +>>>>>>> 95c83ca7f (GEOMESA-3100 Kafka layer views (#2784)) +<<<<<<< HEAD +>>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fa68dd43c6 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> de8804123e (GEOMESA-3100 Kafka layer views (#2784)) @@ -1428,11 +1457,16 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 2f6607232 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -1441,6 +1475,7 @@ >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= +<<<<<<< HEAD >>>>>>> c2a94543ba (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD @@ -1494,6 +1529,10 @@ >>>>>>> 885a095ca8 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> 0e1c98d0b5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= +>>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= @@ -1509,6 +1548,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1805,6 +1845,8 @@ ======= >>>>>>> 0e1c98d0b5 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> a0314fb7f (GEOMESA-3100 Kafka layer views (#2784)) ======= ======= @@ -1824,6 +1866,7 @@ <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1835,6 +1878,8 @@ <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -1848,6 +1893,7 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -1905,6 +1951,8 @@ >>>>>>> dcd54df39d (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> locationtech-main ======= >>>>>>> 58286bfd3 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1916,6 +1964,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD @@ -1963,19 +2012,32 @@ <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 9236b0208 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> 862857ce2 (GEOMESA-3100 Kafka layer views (#2784)) +======= +======= +>>>>>>> locationtech-main >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) @@ -1984,6 +2046,8 @@ ======= >>>>>>> c44e474495 (GEOMESA-3100 Kafka layer views (#2784)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) ======= >>>>>>> d0dc799ff (GEOMESA-3100 Kafka layer views (#2784)) @@ -1992,6 +2056,7 @@ >>>>>>> 28427dfd8 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ffbc2ce32a (GEOMESA-3100 Kafka layer views (#2784)) @@ -2002,6 +2067,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) ======= @@ -2010,6 +2077,7 @@ >>>>>>> 4231e686d (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> fa68dd43c6 (GEOMESA-3100 Kafka layer views (#2784)) @@ -2020,10 +2088,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 936154130 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -2039,6 +2110,9 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> ac0357d36 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> bddfdbea5 (GEOMESA-3100 Kafka layer views (#2784)) @@ -2047,6 +2121,7 @@ >>>>>>> a62b956fb (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c57b5f538a (GEOMESA-3100 Kafka layer views (#2784)) @@ -2057,12 +2132,15 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> ea3b40e18 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD >>>>>>> 4adaa7f47 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 88ef67cdfe (GEOMESA-3100 Kafka layer views (#2784)) @@ -2073,10 +2151,13 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> d2cb939f5 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) <<<<<<< HEAD ======= @@ -2092,6 +2173,9 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> 6af71ff43 (GEOMESA-3100 Kafka layer views (#2784)) +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') @@ -2099,6 +2183,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') ======= @@ -5993,6 +6078,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at diff --git a/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/streams/GeoMesaStreamsBuilderTest.scala b/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/streams/GeoMesaStreamsBuilderTest.scala index 785ba01ec305..2b305ed89064 100644 --- a/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/streams/GeoMesaStreamsBuilderTest.scala +++ b/geomesa-kafka/geomesa-kafka-datastore/src/test/scala/org/locationtech/geomesa/kafka/streams/GeoMesaStreamsBuilderTest.scala @@ -633,6 +633,7 @@ class GeoMesaStreamsBuilderTest extends KafkaContainerTest { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= buf >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) @@ -752,6 +753,11 @@ class GeoMesaStreamsBuilderTest extends KafkaContainerTest { buf >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= + buf +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main } val timestampExtractor = new TimestampExtractingTransformer() @@ -782,6 +788,7 @@ class GeoMesaStreamsBuilderTest extends KafkaContainerTest { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= props.put(StreamsConfig.APPLICATION_ID_CONFIG, "geomesa-test-app") >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) @@ -901,6 +908,11 @@ class GeoMesaStreamsBuilderTest extends KafkaContainerTest { props.put(StreamsConfig.APPLICATION_ID_CONFIG, "geomesa-test-app") >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= + props.put(StreamsConfig.APPLICATION_ID_CONFIG, "geomesa-test-app") +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, "dummy:1234") val output = scala.collection.mutable.Map.empty[String, java.lang.Long] @@ -1054,6 +1066,7 @@ class GeoMesaStreamsBuilderTest extends KafkaContainerTest { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= props.put(StreamsConfig.APPLICATION_ID_CONFIG, "geomesa-test-app") >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) @@ -1173,6 +1186,11 @@ class GeoMesaStreamsBuilderTest extends KafkaContainerTest { props.put(StreamsConfig.APPLICATION_ID_CONFIG, "geomesa-test-app") >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= + props.put(StreamsConfig.APPLICATION_ID_CONFIG, "geomesa-test-app") +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, "dummy:1234") val kryoMessages = ArrayBuffer.empty[ProducerRecord[Array[Byte], Array[Byte]]] diff --git a/geomesa-kafka/geomesa-kafka-dist/pom.xml b/geomesa-kafka/geomesa-kafka-dist/pom.xml index 55c293987005..7e7db77d74dd 100644 --- a/geomesa-kafka/geomesa-kafka-dist/pom.xml +++ b/geomesa-kafka/geomesa-kafka-dist/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml index 9714dafb2ccc..b76ef9d6035b 100644 --- a/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml +++ b/geomesa-kafka/geomesa-kafka-gs-plugin/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-kafka/geomesa-kafka-tools/pom.xml b/geomesa-kafka/geomesa-kafka-tools/pom.xml index 8d68f0b59212..2c17aeab1604 100644 --- a/geomesa-kafka/geomesa-kafka-tools/pom.xml +++ b/geomesa-kafka/geomesa-kafka-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-kafka/geomesa-kafka-utils/pom.xml b/geomesa-kafka/geomesa-kafka-utils/pom.xml index 6366c31af4c6..217d66b90a83 100644 --- a/geomesa-kafka/geomesa-kafka-utils/pom.xml +++ b/geomesa-kafka/geomesa-kafka-utils/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-kafka/pom.xml b/geomesa-kafka/pom.xml index f09cfefce87b..8679717d24b8 100644 --- a/geomesa-kafka/pom.xml +++ b/geomesa-kafka/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 @@ -11250,6 +11316,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -11311,6 +11378,9 @@ ======= ======= >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +======= +>>>>>>> locationtech-main UTF-8 @@ -11462,6 +11532,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) ======= <<<<<<< HEAD @@ -11553,4 +11624,7 @@ ======= >>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) >>>>>>> dfd160ebf9 (GEOMESA-3198 Kafka streams integration (#2854)) +======= +>>>>>>> de758f45a (GEOMESA-3198 Kafka streams integration (#2854)) +>>>>>>> locationtech-main diff --git a/geomesa-kudu/geomesa-kudu-datastore/pom.xml b/geomesa-kudu/geomesa-kudu-datastore/pom.xml index 5a5087d0669b..5ea36e7ad61b 100644 --- a/geomesa-kudu/geomesa-kudu-datastore/pom.xml +++ b/geomesa-kudu/geomesa-kudu-datastore/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-kudu/geomesa-kudu-dist/pom.xml b/geomesa-kudu/geomesa-kudu-dist/pom.xml index 76134c94cbfb..b71cda318fd7 100644 --- a/geomesa-kudu/geomesa-kudu-dist/pom.xml +++ b/geomesa-kudu/geomesa-kudu-dist/pom.xml @@ -111,6 +111,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1281,11 +1282,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2392,6 +2396,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2400,6 +2406,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2892,12 +2899,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3273,6 +3287,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3280,12 +3302,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3326,6 +3352,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3339,6 +3370,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3457,11 +3489,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3472,11 +3508,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3620,6 +3659,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3631,6 +3674,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3909,6 +3953,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3920,6 +3970,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4067,6 +4118,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4079,6 +4132,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6698,6 +6752,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6794,6 +6850,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8269,6 +8326,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8287,6 +8346,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9782,12 +9842,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12486,6 +12549,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12493,6 +12558,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12535,9 +12601,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14093,6 +14162,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14100,6 +14173,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14166,10 +14240,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14187,10 +14286,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14224,19 +14331,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15305,11 +15431,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15327,6 +15458,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-kudu/geomesa-kudu-gs-plugin/pom.xml b/geomesa-kudu/geomesa-kudu-gs-plugin/pom.xml index 3c9dfccba0f0..8cafeb3a532b 100644 --- a/geomesa-kudu/geomesa-kudu-gs-plugin/pom.xml +++ b/geomesa-kudu/geomesa-kudu-gs-plugin/pom.xml @@ -111,6 +111,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1281,11 +1282,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2392,6 +2396,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2400,6 +2406,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2892,12 +2899,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3273,6 +3287,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3280,12 +3302,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3326,6 +3352,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3339,6 +3370,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3457,11 +3489,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3472,11 +3508,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3620,6 +3659,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3631,6 +3674,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3909,6 +3953,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3920,6 +3970,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4067,6 +4118,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4079,6 +4132,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6698,6 +6752,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6794,6 +6850,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8269,6 +8326,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8287,6 +8346,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9782,12 +9842,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12486,6 +12549,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12493,6 +12558,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12535,9 +12601,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14093,6 +14162,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14100,6 +14173,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14166,10 +14240,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14187,10 +14286,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14224,19 +14331,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15305,11 +15431,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15327,6 +15458,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml @@ -15364,6 +15505,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15562,6 +15704,8 @@ >>>>>>> locationtech-main ======= >>>>>>> ea5bb37862 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> locationtech-main org.locationtech.geomesa geomesa-feature-avro_${scala.binary.version} @@ -15585,6 +15729,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15846,6 +15991,8 @@ >>>>>>> 06775f0442 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> ea5bb37862 (GEOMESA-3135 Fix classpath for HBase/Kudu/Bigtable GeoServer Avro export (#2805)) +======= +>>>>>>> locationtech-main diff --git a/geomesa-kudu/geomesa-kudu-spark-runtime/pom.xml b/geomesa-kudu/geomesa-kudu-spark-runtime/pom.xml index f3265e18f374..459bc3b42457 100644 --- a/geomesa-kudu/geomesa-kudu-spark-runtime/pom.xml +++ b/geomesa-kudu/geomesa-kudu-spark-runtime/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1321,11 +1322,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2447,6 +2451,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2455,6 +2461,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2947,12 +2954,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3328,6 +3342,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3335,12 +3357,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3381,6 +3407,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3394,6 +3425,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3512,11 +3544,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3527,11 +3563,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3675,6 +3714,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3686,6 +3729,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3964,6 +4008,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3975,6 +4025,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4122,6 +4173,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4134,6 +4187,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6753,6 +6807,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6849,6 +6905,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8324,6 +8381,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8342,6 +8401,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9837,12 +9897,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12568,6 +12631,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12575,6 +12640,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12617,9 +12683,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14228,6 +14297,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14235,6 +14308,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14305,10 +14379,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14326,10 +14425,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14363,19 +14470,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15482,11 +15608,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15504,6 +15635,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-kudu/geomesa-kudu-spark/pom.xml b/geomesa-kudu/geomesa-kudu-spark/pom.xml index 5aa60fbdfcb8..7eadc31d8420 100644 --- a/geomesa-kudu/geomesa-kudu-spark/pom.xml +++ b/geomesa-kudu/geomesa-kudu-spark/pom.xml @@ -46,6 +46,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -288,6 +289,8 @@ >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -298,6 +301,7 @@ ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -351,6 +355,9 @@ ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -395,6 +402,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 1562748d0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -593,6 +601,9 @@ ======= >>>>>>> 65ba54511b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -606,6 +617,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= @@ -772,6 +784,9 @@ ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) @@ -787,6 +802,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 65054b6a3b ([maven-release-plugin] prepare for next development iteration) ======= @@ -926,11 +942,19 @@ >>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -940,6 +964,8 @@ >>>>>>> 0088e6eff1 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -949,6 +975,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -961,10 +988,13 @@ >>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -974,12 +1004,16 @@ >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1008,12 +1042,17 @@ >>>>>>> 8d80a87f7e ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1040,12 +1079,19 @@ >>>>>>> 5fae301729 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1059,6 +1105,8 @@ ======= >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -1066,6 +1114,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -1576,6 +1625,8 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -1645,6 +1696,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2169,6 +2221,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2187,6 +2241,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -2285,6 +2340,14 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -2301,6 +2364,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= @@ -2394,6 +2458,15 @@ ======= >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -2407,6 +2480,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4740,6 +4814,8 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -4749,6 +4825,7 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbe90ad83 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) @@ -4832,6 +4909,11 @@ >>>>>>> 856bf16b3e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 5e17a3f87 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD @@ -4845,6 +4927,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) ======= @@ -4858,11 +4941,16 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main +======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) ======= ======= +<<<<<<< HEAD >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) @@ -5054,6 +5142,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 5f93befebf ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -5070,6 +5160,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -5177,6 +5268,8 @@ ======= ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -5184,6 +5277,7 @@ ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= @@ -5230,6 +5324,11 @@ ======= ======= >>>>>>> 65054b6a3b ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +>>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +======= +======= >>>>>>> locationtech-main 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -5237,6 +5336,9 @@ >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -5247,6 +5349,7 @@ ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -5284,10 +5387,16 @@ >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -9242,6 +9351,23 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-kudu/geomesa-kudu-tools/pom.xml b/geomesa-kudu/geomesa-kudu-tools/pom.xml index 50fbb9c3faa1..fdba06dfaa95 100644 --- a/geomesa-kudu/geomesa-kudu-tools/pom.xml +++ b/geomesa-kudu/geomesa-kudu-tools/pom.xml @@ -110,6 +110,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1280,11 +1281,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2391,6 +2395,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2399,6 +2405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2891,12 +2898,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3272,6 +3286,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3279,12 +3301,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3325,6 +3351,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3338,6 +3369,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3456,11 +3488,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3471,11 +3507,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3619,6 +3658,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3630,6 +3673,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3908,6 +3952,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3919,6 +3969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4066,6 +4117,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4078,6 +4131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6697,6 +6751,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6793,6 +6849,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8268,6 +8325,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8286,6 +8345,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9781,12 +9841,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12485,6 +12548,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12492,6 +12557,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12534,9 +12600,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14092,6 +14161,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14099,6 +14172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14165,10 +14239,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14186,10 +14285,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14223,19 +14330,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15304,11 +15430,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15326,6 +15457,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-kudu/pom.xml b/geomesa-kudu/pom.xml index f70abfd4ae71..363e21464325 100644 --- a/geomesa-kudu/pom.xml +++ b/geomesa-kudu/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-lambda/geomesa-lambda-datastore/pom.xml b/geomesa-lambda/geomesa-lambda-datastore/pom.xml index 7908be24d790..ac5593c1bb3f 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/pom.xml +++ b/geomesa-lambda/geomesa-lambda-datastore/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main geomesa-lambda-datastore_2.12 diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStore.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStore.scala index 00a081af9449..e19f6ff588f9 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStore.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStore.scala @@ -19,6 +19,7 @@ import org.locationtech.geomesa.index.geotools.GeoMesaFeatureReader.HasGeoMesaFe <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -131,6 +132,10 @@ import org.locationtech.geomesa.index.geotools.GeoMesaFeatureReader.HasGeoMesaFe ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import org.locationtech.geomesa.index.geotools.{GeoMesaDataStore, GeoMesaFeatureReader, GeoMesaFeatureStore} import org.locationtech.geomesa.index.stats.{GeoMesaStats, HasGeoMesaStats, NoopStats} import org.locationtech.geomesa.lambda.data.LambdaDataStore.LambdaConfig @@ -156,6 +161,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= extends DataStore with HasGeoMesaStats with LazyLogging { >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -275,6 +281,11 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit extends DataStore with HasGeoMesaStats with LazyLogging { >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= + extends DataStore with HasGeoMesaStats with LazyLogging { +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.geotools.RichSimpleFeatureType.RichSimpleFeatureType @@ -390,6 +401,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7ab33423d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -2673,6 +2685,12 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 9b3fdf0389 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -2701,6 +2719,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eee5d7ae15 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> efae05a8fa (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -2769,11 +2788,16 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 0d96d8bd55 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -2790,6 +2814,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 275e53813f (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -3556,6 +3581,12 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> locationtech-main ======= ======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -3572,6 +3603,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -3908,10 +3940,18 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fd0793971d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -7393,10 +7433,19 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= ======= ======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +<<<<<<< HEAD >>>>>>> 8999b3f6b9 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> d86a5b91d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD @@ -7470,10 +7519,22 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= ======= ======= +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 91b0d6a88 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD >>>>>>> 49d3846b23 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -7486,6 +7547,8 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -7495,6 +7558,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ae5490a34 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 4b08d07fef (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -7507,11 +7571,14 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 1b5719bd3 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') @@ -7675,6 +7742,10 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main private [lambda] val transients = Caffeine.newBuilder().build[String, TransientStore]( new CacheLoader[String, TransientStore] { override def load(key: String): TransientStore = @@ -7784,6 +7855,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 29f1317169 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -8152,10 +8224,13 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e762caca54 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> cd59b646a9 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -8182,9 +8257,14 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> 6ee72f98ac (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 83670fc938 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -8193,12 +8273,21 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> eb01a83daf (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -8209,6 +8298,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +<<<<<<< HEAD ======= >>>>>>> 3978e210e2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -10008,6 +10098,10 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD @@ -10040,6 +10134,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 72415e208a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -10846,6 +10941,10 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -10866,6 +10965,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0f2a67fb44 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -13793,11 +13893,17 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD >>>>>>> a1ccc017c6 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 9b3fdf0389 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -13820,10 +13926,20 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> 0d96d8bd55 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3978e210e2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -13837,9 +13953,16 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= ======= ======= +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7c98bab97e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= @@ -13851,6 +13974,13 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 869683ad83 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main private [lambda] val transients = Caffeine.newBuilder().build(new CacheLoader[String, TransientStore] { override def load(key: String): TransientStore = new KafkaStore(persistence, persistence.getSchema(key), authProvider, config) @@ -13858,6 +13988,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13902,6 +14033,8 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -13998,6 +14131,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 254d97a0a7 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -14888,11 +15022,17 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> locationtech-main +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> a990ff330c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -15499,6 +15639,8 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> 3c53246c9a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -15510,6 +15652,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -15527,6 +15670,8 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> df7438e650 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -15538,6 +15683,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -15900,6 +16046,14 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> 3c53246c9a (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main +======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -15927,6 +16081,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> de3e57f03 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -16095,6 +16250,10 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> eb01a83daf (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= >>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -16103,6 +16262,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +<<<<<<< HEAD >>>>>>> a990ff330c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> c1d8349faf (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -16146,6 +16306,8 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> 9b3fdf0389 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -16162,6 +16324,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17003,6 +17166,14 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> 9807b0926d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> locationtech-main ======= +======= +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> locationtech-main >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 45dca3e07 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -17017,6 +17188,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 113b056da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -17624,9 +17796,17 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD >>>>>>> locationtech-main ======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> dc17df6c0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +<<<<<<< HEAD ======= >>>>>>> 9b5d82faee (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -19731,6 +19911,14 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= ======= ======= +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> 3cb02b7b0 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 374ba65da (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -19738,6 +19926,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d86a5b91d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 25aee54981 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -19893,12 +20082,25 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit >>>>>>> 0f0dd6560e (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= ======= +>>>>>>> 5d898c0c5 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> ee3aea1cd (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> f8f49130b (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19920,6 +20122,8 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= @@ -19929,6 +20133,7 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit <<<<<<< HEAD >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ae5490a34 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> 4b08d07fef (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -20905,12 +21110,15 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 595c43086 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 0cdf3f267 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) ======= +<<<<<<< HEAD >>>>>>> 71adb695c5 (Merge branch 'feature/postgis-fixes') >>>>>>> 44b15e96d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) <<<<<<< HEAD @@ -21422,6 +21630,9 @@ class LambdaDataStore(val persistence: DataStore, config: LambdaConfig)(implicit ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main override val stats: GeoMesaStats = persistence match { case p: HasGeoMesaStats => new LambdaStats(p.stats, transients) diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStoreFactory.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStoreFactory.scala index 18960c7b83b5..3be433e93376 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStoreFactory.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStoreFactory.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.lambda.data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -73,6 +74,9 @@ package org.locationtech.geomesa.lambda.data ======= ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> locationtech-main import java.awt.RenderingHints.Key import java.io.Serializable import java.time.Clock @@ -80,6 +84,7 @@ import java.time.Clock <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD @@ -171,6 +176,9 @@ import java.time.Clock ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import org.geotools.data.DataAccessFactory.Param import org.geotools.data.{DataStore, DataStoreFactorySpi} import org.locationtech.geomesa.accumulo.data.{AccumuloDataStoreFactory, AccumuloDataStoreParams} @@ -184,6 +192,7 @@ import java.time.Clock <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -296,6 +305,10 @@ import java.time.Clock ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import scala.reflect.ClassTag class LambdaDataStoreFactory extends DataStoreFactorySpi { @@ -307,6 +320,7 @@ class LambdaDataStoreFactory extends DataStoreFactorySpi { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= override def createDataStore(params: java.util.Map[String, Serializable]): DataStore = { >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -426,6 +440,11 @@ class LambdaDataStoreFactory extends DataStoreFactorySpi { override def createDataStore(params: java.util.Map[String, Serializable]): DataStore = { >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= + override def createDataStore(params: java.util.Map[String, Serializable]): DataStore = { +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main // TODO GEOMESA-1891 attribute level vis val persistence = new AccumuloDataStoreFactory().createDataStore(LambdaDataStoreFactory.filter(params)) val config = LambdaDataStoreParams.parse(params, persistence.config.catalog) @@ -505,6 +524,7 @@ object LambdaDataStoreFactory extends GeoMesaDataStoreInfo { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -566,6 +586,9 @@ object LambdaDataStoreFactory extends GeoMesaDataStoreInfo { ======= ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> locationtech-main @deprecated("replaced with LambdaDataStoreParams") object Kafka { @@ -590,6 +613,7 @@ object LambdaDataStoreFactory extends GeoMesaDataStoreInfo { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= <<<<<<< HEAD @@ -681,6 +705,9 @@ object LambdaDataStoreFactory extends GeoMesaDataStoreInfo { ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main } private def copy[T <: AnyRef](p: GeoMesaParam[T])(implicit ct: ClassTag[T]): GeoMesaParam[T] = { @@ -699,6 +726,7 @@ object LambdaDataStoreFactory extends GeoMesaDataStoreInfo { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= .asJava.asInstanceOf[java.util.Map[String, Serializable]] >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -818,5 +846,10 @@ object LambdaDataStoreFactory extends GeoMesaDataStoreInfo { .asJava.asInstanceOf[java.util.Map[String, Serializable]] >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= + .asJava.asInstanceOf[java.util.Map[String, Serializable]] +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main } } diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStoreParams.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStoreParams.scala index 7052cd649c33..da55664860ab 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStoreParams.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/data/LambdaDataStoreParams.scala @@ -17,6 +17,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -24,6 +27,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -434,6 +438,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -441,6 +447,7 @@ <<<<<<< HEAD >>>>>>> 120815d0b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b54485f5a2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -455,12 +462,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -809,6 +819,8 @@ >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -821,6 +833,7 @@ package org.locationtech.geomesa.lambda.data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -974,11 +987,16 @@ import java.util.Properties >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import java.time.Clock import java.util.Properties >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.index.geotools.GeoMesaDataStoreFactory.GeoMesaDataStoreParams import org.locationtech.geomesa.lambda.data.LambdaDataStore.LambdaConfig import org.locationtech.geomesa.lambda.stream.{OffsetManager, ZookeeperOffsetManager} @@ -991,6 +1009,7 @@ import java.util.Properties <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -1103,6 +1122,10 @@ import java.util.Properties ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main import scala.concurrent.duration.Duration object LambdaDataStoreParams extends GeoMesaDataStoreParams with SecurityParams { diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/DataStorePersistence.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/DataStorePersistence.scala index 4aef80bd3225..3df624c6c4d7 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/DataStorePersistence.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/DataStorePersistence.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.lambda.stream.kafka <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -165,11 +166,16 @@ import java.util.concurrent.{Executors, TimeUnit} >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import java.io.Closeable import java.time.Clock import java.util.concurrent.{Executors, TimeUnit} >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +<<<<<<< HEAD >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging import org.geotools.data.{DataStore, Transaction} import org.locationtech.geomesa.lambda.stream.OffsetManager diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCache.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCache.scala index c6a40ee1ece4..d87c9f437c6e 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCache.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaFeatureCache.scala @@ -129,6 +129,7 @@ class KafkaFeatureCache(topic: String) extends WritableFeatureCache with Readabl <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ExpiredFeatures(maxExpiredOffset, latest) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -248,6 +249,11 @@ class KafkaFeatureCache(topic: String) extends WritableFeatureCache with Readabl ExpiredFeatures(maxExpiredOffset, latest) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= + ExpiredFeatures(maxExpiredOffset, latest) +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main } override def offsetChanged(partition: Int, offset: Long): Unit = { diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStore.scala b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStore.scala index f243ac8a0ef0..b539a16a2aba 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStore.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/main/scala/org/locationtech/geomesa/lambda/stream/kafka/KafkaStore.scala @@ -153,6 +153,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') @@ -350,12 +351,15 @@ class KafkaStore( ======= >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -366,12 +370,15 @@ class KafkaStore( <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -382,6 +389,8 @@ class KafkaStore( <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -390,6 +399,7 @@ class KafkaStore( ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -534,6 +544,10 @@ class KafkaStore( >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -563,6 +577,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -649,6 +664,8 @@ class KafkaStore( >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> a1258aa46 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -656,6 +673,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -734,11 +752,17 @@ class KafkaStore( ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main +======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main @@ -789,6 +813,11 @@ class KafkaStore( ======= >>>>>>> locationtech-main ======= +>>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= >>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= @@ -796,6 +825,7 @@ class KafkaStore( >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -818,10 +848,15 @@ class KafkaStore( >>>>>>> 3978e210e2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= +>>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -861,15 +896,21 @@ class KafkaStore( >>>>>>> 2d530ccd7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main ======= ======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main @@ -987,6 +1028,11 @@ class KafkaStore( >>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> locationtech-main ======= +>>>>>>> b36757a53 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= ======= >>>>>>> 9cdd96d1c (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -995,6 +1041,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD @@ -7917,6 +7964,13 @@ class KafkaStore( private val producer = KafkaStore.producer(sft, config.producerConfig) ======= private val producer = KafkaStore.producer(config.producerConfig) +======= +======= +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) + private val producer = KafkaStore.producer(sft, config.producerConfig) +======= + private val producer = KafkaStore.producer(config.producerConfig) +>>>>>>> locationtech-main >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -7938,6 +7992,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 843ec0804f (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -8584,6 +8639,13 @@ class KafkaStore( >>>>>>> 2f07d41dc5 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD +======= +======= +>>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD @@ -8601,12 +8663,15 @@ class KafkaStore( ======= ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +<<<<<<< HEAD ======= ======= ======= >>>>>>> 4de07d7256 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 8b399833c2 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main private val producer = KafkaStore.producer(sft, config.producerConfig) >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -8619,6 +8684,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8b399833c2 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> eee5d7ae15 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -8709,6 +8775,8 @@ class KafkaStore( ======= >>>>>>> 2d530ccd7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -8717,6 +8785,9 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -8725,6 +8796,7 @@ class KafkaStore( ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6a3ccffd0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= ======= @@ -8751,6 +8823,8 @@ class KafkaStore( >>>>>>> 8170c2c54 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 2d530ccd7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main ======= private val producer = KafkaStore.producer(sft, config.producerConfig) >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -8770,6 +8844,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c6444c154b (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD @@ -8878,6 +8953,13 @@ class KafkaStore( ======= ======= >>>>>>> 9a6480bbdd (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +======= +>>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main ======= private val producer = KafkaStore.producer(sft, config.producerConfig) >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -8906,6 +8988,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9a6480bbdd (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -9030,10 +9113,20 @@ class KafkaStore( >>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> fa833cc6f7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +======= +>>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +<<<<<<< HEAD +======= +>>>>>>> f487c279d (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main +======= ======= private val producer = KafkaStore.producer(sft, config.producerConfig) >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ed371dc574 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -9042,6 +9135,9 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= >>>>>>> eee5d7ae1 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -9049,6 +9145,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a7ca1d57e (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -9067,12 +9164,23 @@ class KafkaStore( <<<<<<< HEAD ======= ======= +======= +>>>>>>> 92dccb4d7 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> 99fd8486a (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 30d431265 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 98a03c586 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -9083,6 +9191,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5db00999ef (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -9098,6 +9207,8 @@ class KafkaStore( ======= >>>>>>> a51d9f1aa (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= ======= private val producer = KafkaStore.producer(sft, config.producerConfig) >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -9107,6 +9218,7 @@ class KafkaStore( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ea8fbcfbe5 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD @@ -12640,6 +12752,8 @@ class KafkaStore( ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -12650,6 +12764,7 @@ class KafkaStore( <<<<<<< HEAD >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e762caca54 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD >>>>>>> ff17a571bc (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -13408,6 +13523,8 @@ class KafkaStore( ======= >>>>>>> b5c172e61 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= ======= ======= private val producer = KafkaStore.producer(sft, config.producerConfig) @@ -13415,6 +13532,7 @@ class KafkaStore( >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +<<<<<<< HEAD >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') >>>>>>> 404627bdc (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD @@ -13590,6 +13708,10 @@ class KafkaStore( private val producer = KafkaStore.producer(sft, config.producerConfig) >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= + private val producer = KafkaStore.producer(sft, config.producerConfig) +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main private val topic = KafkaStore.topic(config.zkNamespace, sft) diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaDataStoreTest.scala b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaDataStoreTest.scala index 527ea82f9c08..b485ed65c530 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaDataStoreTest.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/LambdaDataStoreTest.scala @@ -197,6 +197,7 @@ class LambdaDataStoreTest extends LambdaContainerTest { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= val query = new Query(sft.getTypeName, Filter.INCLUDE, transform.getAttributeDescriptors.asScala.map(_.getLocalName).toArray) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -316,6 +317,11 @@ class LambdaDataStoreTest extends LambdaContainerTest { val query = new Query(sft.getTypeName, Filter.INCLUDE, transform.getAttributeDescriptors.asScala.map(_.getLocalName).toArray) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= + val query = new Query(sft.getTypeName, Filter.INCLUDE, transform.getAttributeDescriptors.asScala.map(_.getLocalName).toArray) +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main // note: need to copy the features as the same object is re-used in the iterator val iter = SelfClosingIterator(ds.getFeatureReader(query, Transaction.AUTO_COMMIT)) val result = iter.map(DataUtilities.encodeFeature).toSeq @@ -475,6 +481,7 @@ class LambdaDataStoreTest extends LambdaContainerTest { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= eventually(40, 100.millis)(SelfClosingIterator(store.transients.get(sft.getTypeName).read()) must beEmpty) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) @@ -594,6 +601,11 @@ class LambdaDataStoreTest extends LambdaContainerTest { eventually(40, 100.millis)(SelfClosingIterator(store.transients.get(sft.getTypeName).read()) must beEmpty) >>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) >>>>>>> 1b0b697d7d (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +======= +======= + eventually(40, 100.millis)(SelfClosingIterator(store.transients.get(sft.getTypeName).read()) must beEmpty) +>>>>>>> 1a21a3c30 (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)) +>>>>>>> locationtech-main SelfClosingIterator(store.getFeatureReader(new Query(sft.getTypeName), Transaction.AUTO_COMMIT)).toSeq must containTheSameElementsAs(Seq(update, features.last)) } diff --git a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/FeatureIdPartitionerTest.scala b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/FeatureIdPartitionerTest.scala index f288226f5a4a..efed027cc83b 100644 --- a/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/FeatureIdPartitionerTest.scala +++ b/geomesa-lambda/geomesa-lambda-datastore/src/test/scala/org/locationtech/geomesa/lambda/stream/kafka/FeatureIdPartitionerTest.scala @@ -17,6 +17,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -24,6 +27,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -434,6 +438,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -441,6 +447,7 @@ <<<<<<< HEAD >>>>>>> 5ad2f6a7b (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 865c4a0be4 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD <<<<<<< HEAD @@ -455,12 +462,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -809,6 +819,8 @@ >>>>>>> 8252893b4e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at diff --git a/geomesa-lambda/geomesa-lambda-dist/pom.xml b/geomesa-lambda/geomesa-lambda-dist/pom.xml index 138dc616ec25..e982cc5d300e 100644 --- a/geomesa-lambda/geomesa-lambda-dist/pom.xml +++ b/geomesa-lambda/geomesa-lambda-dist/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml index 407b3a251aeb..0fcf18e1894c 100644 --- a/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml +++ b/geomesa-lambda/geomesa-lambda-gs-plugin/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-lambda/geomesa-lambda-tools/pom.xml b/geomesa-lambda/geomesa-lambda-tools/pom.xml index 180ef3680e3c..157ea07a5c2a 100644 --- a/geomesa-lambda/geomesa-lambda-tools/pom.xml +++ b/geomesa-lambda/geomesa-lambda-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-lambda/pom.xml b/geomesa-lambda/pom.xml index 61af8d2203c7..823f41fc40f4 100644 --- a/geomesa-lambda/pom.xml +++ b/geomesa-lambda/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine-datastore/pom.xml b/geomesa-memory/geomesa-cqengine-datastore/pom.xml index 72911e5bea0f..0c953bb5e287 100644 --- a/geomesa-memory/geomesa-cqengine-datastore/pom.xml +++ b/geomesa-memory/geomesa-cqengine-datastore/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-memory/geomesa-cqengine/pom.xml b/geomesa-memory/geomesa-cqengine/pom.xml index a0cc6c2b5f7d..43b08827ed9a 100644 --- a/geomesa-memory/geomesa-cqengine/pom.xml +++ b/geomesa-memory/geomesa-cqengine/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-memory/pom.xml b/geomesa-memory/pom.xml index 489d2bd381ad..2d194afa8619 100644 --- a/geomesa-memory/pom.xml +++ b/geomesa-memory/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-cloudwatch/pom.xml b/geomesa-metrics/geomesa-metrics-cloudwatch/pom.xml index 38a086fc1244..774886623f8e 100644 --- a/geomesa-metrics/geomesa-metrics-cloudwatch/pom.xml +++ b/geomesa-metrics/geomesa-metrics-cloudwatch/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-core/pom.xml b/geomesa-metrics/geomesa-metrics-core/pom.xml index 87a34818f8fa..d01fab4f2f38 100644 --- a/geomesa-metrics/geomesa-metrics-core/pom.xml +++ b/geomesa-metrics/geomesa-metrics-core/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-ganglia/pom.xml b/geomesa-metrics/geomesa-metrics-ganglia/pom.xml index 838a116c14a2..1ac7d71a3e7a 100644 --- a/geomesa-metrics/geomesa-metrics-ganglia/pom.xml +++ b/geomesa-metrics/geomesa-metrics-ganglia/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-metrics/geomesa-metrics-graphite/pom.xml b/geomesa-metrics/geomesa-metrics-graphite/pom.xml index 37d3ad0e1b18..9b0ef35f67ea 100644 --- a/geomesa-metrics/geomesa-metrics-graphite/pom.xml +++ b/geomesa-metrics/geomesa-metrics-graphite/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-metrics/pom.xml b/geomesa-metrics/pom.xml index c9d31d0fd67a..d4a4366083e5 100644 --- a/geomesa-metrics/pom.xml +++ b/geomesa-metrics/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-process/geomesa-process-vector/pom.xml b/geomesa-process/geomesa-process-vector/pom.xml index 4515811f64c8..fd77aebd028f 100644 --- a/geomesa-process/geomesa-process-vector/pom.xml +++ b/geomesa-process/geomesa-process-vector/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-process/geomesa-process-wps/pom.xml b/geomesa-process/geomesa-process-wps/pom.xml index 6e0867bd2e91..7f38da286468 100644 --- a/geomesa-process/geomesa-process-wps/pom.xml +++ b/geomesa-process/geomesa-process-wps/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-process/pom.xml b/geomesa-process/pom.xml index ba50c5ccf1fa..01673097b927 100644 --- a/geomesa-process/pom.xml +++ b/geomesa-process/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-redis/geomesa-redis-datastore/pom.xml b/geomesa-redis/geomesa-redis-datastore/pom.xml index 931c50a39ebf..90a55bb623eb 100644 --- a/geomesa-redis/geomesa-redis-datastore/pom.xml +++ b/geomesa-redis/geomesa-redis-datastore/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 jar diff --git a/geomesa-redis/geomesa-redis-dist/pom.xml b/geomesa-redis/geomesa-redis-dist/pom.xml index defd7c088ac8..020debada088 100644 --- a/geomesa-redis/geomesa-redis-dist/pom.xml +++ b/geomesa-redis/geomesa-redis-dist/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 pom diff --git a/geomesa-redis/geomesa-redis-gs-plugin/pom.xml b/geomesa-redis/geomesa-redis-gs-plugin/pom.xml index a56550edc0ba..733806f3a20e 100644 --- a/geomesa-redis/geomesa-redis-gs-plugin/pom.xml +++ b/geomesa-redis/geomesa-redis-gs-plugin/pom.xml @@ -115,6 +115,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -128,11 +129,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6389,6 +6393,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6428,6 +6436,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6446,6 +6455,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6460,6 +6471,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6467,12 +6479,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6484,10 +6499,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6507,6 +6525,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6526,11 +6551,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6542,6 +6570,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6549,19 +6578,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6569,10 +6604,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6580,12 +6618,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6679,6 +6720,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6708,6 +6751,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6810,6 +6854,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6827,14 +6875,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6852,6 +6904,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6860,6 +6914,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6875,9 +6930,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7038,6 +7096,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7183,6 +7243,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9228,12 +9289,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11232,6 +11296,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-redis/geomesa-redis-tools/pom.xml b/geomesa-redis/geomesa-redis-tools/pom.xml index e176f0f6de63..493adfb51506 100644 --- a/geomesa-redis/geomesa-redis-tools/pom.xml +++ b/geomesa-redis/geomesa-redis-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-redis/pom.xml b/geomesa-redis/pom.xml index 2742a9109af1..e40bae0ce8cc 100644 --- a/geomesa-redis/pom.xml +++ b/geomesa-redis/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-security/pom.xml b/geomesa-security/pom.xml index 3e0da4c774ba..b81e55147858 100644 --- a/geomesa-security/pom.xml +++ b/geomesa-security/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-spark/geomesa-spark-converter/pom.xml b/geomesa-spark/geomesa-spark-converter/pom.xml index d151ce4b6545..da80cd472457 100644 --- a/geomesa-spark/geomesa-spark-converter/pom.xml +++ b/geomesa-spark/geomesa-spark-converter/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-spark/geomesa-spark-core/pom.xml b/geomesa-spark/geomesa-spark-core/pom.xml index 3f6be985e1c1..1192a9d3b79b 100644 --- a/geomesa-spark/geomesa-spark-core/pom.xml +++ b/geomesa-spark/geomesa-spark-core/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jts/pom.xml b/geomesa-spark/geomesa-spark-jts/pom.xml index 1a0f8edf2660..02acb39ddee6 100644 --- a/geomesa-spark/geomesa-spark-jts/pom.xml +++ b/geomesa-spark/geomesa-spark-jts/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml b/geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml index 6fcd01808cb7..667b1021849b 100644 --- a/geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml +++ b/geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1504,6 +1505,11 @@ >>>>>>> 58d14a257e (GEOMESA-3254 Add Bloop build support) ======= 3.3.0-SNAPSHOT +======= + 4.1.0-SNAPSHOT +======= + 3.3.0-SNAPSHOT +>>>>>>> locationtech-main >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= 3.4.0-SNAPSHOT @@ -1511,6 +1517,7 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1663,10 +1670,13 @@ ======= ======= ======= +======= +>>>>>>> locationtech-main <<<<<<< HEAD:geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml <<<<<<< HEAD:geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> 3a2e956065 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD ======= @@ -1685,6 +1695,8 @@ 3.4.0-SNAPSHOT ======= >>>>>>> 3a2e956065 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main <<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat):geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml @@ -1697,6 +1709,7 @@ ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> location-main ======= <<<<<<< HEAD @@ -2490,6 +2503,8 @@ ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -2500,6 +2515,7 @@ <<<<<<< HEAD:geomesa-spark/geomesa-spark-jupyter-leaflet/pom.xml >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat):geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f39309c33 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5eb2c4c6ae (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2508,12 +2524,16 @@ ======= ======= ======= +>>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration):geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3759bb86bc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 3072c85d0 ([maven-release-plugin] prepare for next development iteration) @@ -2935,6 +2955,8 @@ >>>>>>> 7c58c5ebda ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -2942,9 +2964,12 @@ <<<<<<< HEAD >>>>>>> 1562748d0b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= 3.4.0-SNAPSHOT @@ -2953,9 +2978,12 @@ <<<<<<< HEAD >>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2969,9 +2997,12 @@ <<<<<<< HEAD >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1261eeea04 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -2980,7 +3011,10 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration):geomesa-jupyter/geomesa-jupyter-leaflet/pom.xml >>>>>>> 9e7e1887a7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-spark/geomesa-spark-jupyter-vegas/pom.xml b/geomesa-spark/geomesa-spark-jupyter-vegas/pom.xml index 694e84e1ce0c..5c7001d44b83 100644 --- a/geomesa-spark/geomesa-spark-jupyter-vegas/pom.xml +++ b/geomesa-spark/geomesa-spark-jupyter-vegas/pom.xml @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= 3.3.0-SNAPSHOT >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat):geomesa-jupyter/geomesa-jupyter-vegas/pom.xml @@ -127,6 +128,11 @@ 3.3.0-SNAPSHOT >>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat):geomesa-jupyter/geomesa-jupyter-vegas/pom.xml >>>>>>> 06775f0442 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= + 3.3.0-SNAPSHOT +>>>>>>> 1108247cc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat):geomesa-jupyter/geomesa-jupyter-vegas/pom.xml +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-spark/geomesa-spark-sql/pom.xml b/geomesa-spark/geomesa-spark-sql/pom.xml index bd96428b78f9..68538dc20f28 100644 --- a/geomesa-spark/geomesa-spark-sql/pom.xml +++ b/geomesa-spark/geomesa-spark-sql/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLColumnsTest.scala b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLColumnsTest.scala index d769fb136e41..e894125bc51b 100644 --- a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLColumnsTest.scala +++ b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkSQLColumnsTest.scala @@ -16,6 +16,7 @@ import org.apache.spark.sql.{SQLContext, SparkSession} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.apache.spark.sql.{SQLContext, SQLTypes, SparkSession} >>>>>>> 544d6f235 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) @@ -135,6 +136,11 @@ import org.apache.spark.sql.{SQLContext, SQLTypes, SparkSession} import org.apache.spark.sql.{SQLContext, SQLTypes, SparkSession} >>>>>>> 544d6f235 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) >>>>>>> f7e376a051 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) +======= +======= +import org.apache.spark.sql.{SQLContext, SQLTypes, SparkSession} +>>>>>>> 544d6f235 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) +>>>>>>> locationtech-main import org.geotools.data.{DataStore, DataStoreFinder, Transaction} import org.junit.runner.RunWith import org.locationtech.geomesa.features.ScalaSimpleFeature diff --git a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkUtilsTest.scala b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkUtilsTest.scala index 097f266ab9c8..615d0cf15e95 100644 --- a/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkUtilsTest.scala +++ b/geomesa-spark/geomesa-spark-sql/src/test/scala/org/locationtech/geomesa/spark/SparkUtilsTest.scala @@ -16,6 +16,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -23,6 +26,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -445,6 +449,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -452,6 +458,7 @@ <<<<<<< HEAD >>>>>>> 7f520da00 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bd7d990658 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) <<<<<<< HEAD <<<<<<< HEAD @@ -466,12 +473,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -812,6 +822,8 @@ >>>>>>> f7e376a051 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -830,6 +842,7 @@ import org.locationtech.geomesa.spark.sql.{SQLTypes, SparkUtils} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -981,11 +994,16 @@ import org.locationtech.geomesa.spark.sql.{SQLTypes, SparkUtils} >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import org.apache.spark.sql.{Row, SQLContext, SQLTypes, SparkSession} import org.junit.runner.RunWith import org.locationtech.geomesa.features.ScalaSimpleFeature >>>>>>> 544d6f235 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) +<<<<<<< HEAD >>>>>>> f7e376a051 (GEOMESA-3078 Support Bytes, List and Map attribute types in GeoMesa Spark SQL) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.geotools.SimpleFeatureTypes import org.locationtech.geomesa.utils.geotools.converters.FastConverter import org.opengis.feature.simple.SimpleFeature diff --git a/geomesa-spark/geomesa_pyspark/pom.xml b/geomesa-spark/geomesa_pyspark/pom.xml index e1baf8d999bc..26076f39da4c 100644 --- a/geomesa-spark/geomesa_pyspark/pom.xml +++ b/geomesa-spark/geomesa_pyspark/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-spark/pom.xml b/geomesa-spark/pom.xml index d8fffc50164c..48cf26e87f41 100644 --- a/geomesa-spark/pom.xml +++ b/geomesa-spark/pom.xml @@ -113,6 +113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -126,11 +127,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6387,6 +6391,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6426,6 +6434,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6444,6 +6453,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6458,6 +6469,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6465,12 +6477,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6482,10 +6497,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6505,6 +6523,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6524,11 +6549,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6540,6 +6568,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6547,19 +6576,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6567,10 +6602,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6578,12 +6616,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6677,6 +6718,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6706,6 +6749,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6808,6 +6852,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6825,14 +6873,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6850,6 +6902,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6858,6 +6912,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6873,9 +6928,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7036,6 +7094,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7181,6 +7241,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9226,12 +9287,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11230,6 +11294,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-stream/geomesa-stream-api/pom.xml b/geomesa-stream/geomesa-stream-api/pom.xml index cb26e7ad4b3c..1bc074ce4711 100644 --- a/geomesa-stream/geomesa-stream-api/pom.xml +++ b/geomesa-stream/geomesa-stream-api/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-stream/geomesa-stream-datastore/pom.xml b/geomesa-stream/geomesa-stream-datastore/pom.xml index 5d03240e893c..a317ee89c98c 100644 --- a/geomesa-stream/geomesa-stream-datastore/pom.xml +++ b/geomesa-stream/geomesa-stream-datastore/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-stream/geomesa-stream-generic/pom.xml b/geomesa-stream/geomesa-stream-generic/pom.xml index 5b3f119004d3..c6e0ee25c46c 100644 --- a/geomesa-stream/geomesa-stream-generic/pom.xml +++ b/geomesa-stream/geomesa-stream-generic/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml index d28142fd82f1..3a73a2f7975a 100644 --- a/geomesa-stream/geomesa-stream-gs-plugin/pom.xml +++ b/geomesa-stream/geomesa-stream-gs-plugin/pom.xml @@ -111,6 +111,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1281,11 +1282,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2392,6 +2396,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2400,6 +2406,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2892,12 +2899,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3273,6 +3287,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3280,12 +3302,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3326,6 +3352,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3339,6 +3370,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3457,11 +3489,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3472,11 +3508,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3620,6 +3659,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3631,6 +3674,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3909,6 +3953,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3920,6 +3970,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4067,6 +4118,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4079,6 +4132,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6698,6 +6752,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6794,6 +6850,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8269,6 +8326,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8287,6 +8346,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9782,12 +9842,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12486,6 +12549,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12493,6 +12558,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12535,9 +12601,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14093,6 +14162,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14100,6 +14173,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14166,10 +14240,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14187,10 +14286,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14224,19 +14331,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15305,11 +15431,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15327,6 +15458,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main ../../geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml diff --git a/geomesa-stream/pom.xml b/geomesa-stream/pom.xml index c4bab6da662b..232f9eb22ced 100644 --- a/geomesa-stream/pom.xml +++ b/geomesa-stream/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-tools/pom.xml b/geomesa-tools/pom.xml index c7d008707c4e..189f207c2113 100644 --- a/geomesa-tools/pom.xml +++ b/geomesa-tools/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 @@ -11350,6 +11416,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -11462,6 +11529,10 @@ ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/CommonParams.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/CommonParams.scala index b1d17ce58c0a..264f817a2c6b 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/CommonParams.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/CommonParams.scala @@ -12,6 +12,7 @@ package org.locationtech.geomesa.tools <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -165,11 +166,16 @@ import java.util.regex.Pattern >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= import java.util import java.util.regex.Pattern >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +<<<<<<< HEAD >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import com.beust.jcommander.validators.PositiveInteger import com.beust.jcommander.{Parameter, ParameterException} import org.locationtech.geomesa.convert.Modes.ErrorMode diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/LocalConverterIngest.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/LocalConverterIngest.scala index d9b9c181fb18..28558621f488 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/LocalConverterIngest.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/ingest/LocalConverterIngest.scala @@ -15,6 +15,7 @@ import org.geotools.data._ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -71,6 +72,9 @@ import org.geotools.data._ ======= ======= >>>>>>> 8252893b4e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +======= +>>>>>>> locationtech-main import java.io.Flushable import java.util.concurrent.atomic.{AtomicInteger, AtomicLong} import java.util.concurrent.{ConcurrentHashMap, CountDownLatch, Executors} @@ -80,6 +84,7 @@ import org.geotools.data.{DataStore, DataStoreFinder, DataUtilities, FeatureWrit <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD @@ -174,6 +179,9 @@ import org.geotools.data._ ======= >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 8252893b4e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main import org.locationtech.geomesa.convert.EvaluationContext import org.locationtech.geomesa.convert2.SimpleFeatureConverter import org.locationtech.geomesa.jobs.JobResult.{JobFailure, JobSuccess} @@ -288,6 +296,7 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') @@ -485,12 +494,15 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle ======= >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -501,12 +513,15 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -517,6 +532,8 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle <<<<<<< HEAD ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -525,6 +542,7 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main <<<<<<< HEAD @@ -669,6 +687,10 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> ca5b0d45d7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -698,6 +720,7 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main <<<<<<< HEAD <<<<<<< HEAD @@ -784,6 +807,8 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> a1258aa46 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -791,6 +816,7 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) @@ -869,11 +895,17 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle ======= >>>>>>> locationtech-main ======= +======= +>>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main +======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD ======= +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main @@ -924,6 +956,11 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle ======= >>>>>>> locationtech-main ======= +>>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= >>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= @@ -931,6 +968,7 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -953,10 +991,15 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle >>>>>>> db69c99cee (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= +>>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> locationtech-main @@ -996,15 +1039,21 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle >>>>>>> 2d530ccd7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= +>>>>>>> locationtech-main +======= >>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) +<<<<<<< HEAD +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main ======= ======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +<<<<<<< HEAD >>>>>>> location-main ======= >>>>>>> locationtech-main @@ -1122,6 +1171,11 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle >>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> locationtech-main ======= +>>>>>>> 0f4c829f2 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> ed371dc57 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= ======= >>>>>>> dd5d6434b (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) @@ -1130,6 +1184,7 @@ import org.locationtech.geomesa.utils.io.fs.LocalDelegate.StdInHandle <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD @@ -8052,6 +8107,13 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} ======= import org.locationtech.geomesa.utils.io.{CloseWithLogging, CloseablePool, WithClose} +======= +======= +>>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} +======= +import org.locationtech.geomesa.utils.io.{CloseWithLogging, CloseablePool, WithClose} +>>>>>>> locationtech-main >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD @@ -8073,6 +8135,7 @@ import org.locationtech.geomesa.utils.io.{CloseWithLogging, CloseablePool, WithC <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 843ec0804f (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -8719,6 +8782,13 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea >>>>>>> 2f07d41dc5 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD +======= +======= +>>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD @@ -8736,12 +8806,15 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea ======= ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +<<<<<<< HEAD ======= ======= ======= >>>>>>> ca4bea4f41 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 8b399833c2 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -8754,6 +8827,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8b399833c2 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 6289007008 (GEOMESA-3071 Move all converter state into evaluation context) @@ -8844,6 +8918,8 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea ======= >>>>>>> 2d530ccd7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= >>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -8852,6 +8928,9 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -8860,6 +8939,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6ac55e1ef (GEOMESA-3071 Move all converter state into evaluation context) ======= ======= @@ -8887,6 +8967,8 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea ======= >>>>>>> 2d530ccd7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -8905,6 +8987,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c6444c154b (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD @@ -9014,6 +9097,13 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea ======= >>>>>>> 9a6480bbdd (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +======= +>>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> locationtech-main +======= import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> a1258aa46 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -9041,6 +9131,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9a6480bbdd (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -9166,9 +9257,19 @@ import org.locationtech.geomesa.utils.io.{CloseWithLogging, CloseablePool, WithC >>>>>>> fa833cc6f7 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= ======= +>>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> 054a72ed9 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +<<<<<<< HEAD +======= +>>>>>>> f3a49e082 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main +======= +======= import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ed371dc574 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= >>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -9177,6 +9278,9 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> c46a601b8 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= >>>>>>> 628900700 (GEOMESA-3071 Move all converter state into evaluation context) ======= >>>>>>> 39183654c (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -9184,6 +9288,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> e734e4d06 (GEOMESA-3071 Move all converter state into evaluation context) ======= @@ -9202,12 +9307,23 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD ======= ======= +======= +>>>>>>> 0d80bae0c (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> 149b7a780 (GEOMESA-3071 Move all converter state into evaluation context) +======= +>>>>>>> f2dc07420 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) +>>>>>>> locationtech-main +======= +======= >>>>>>> 686339d05 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 5ba418ba6 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> d04dc6d34 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -9218,6 +9334,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5db00999ef (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -9233,6 +9350,8 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea ======= >>>>>>> a51d9f1aa (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +>>>>>>> locationtech-main +======= ======= import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} >>>>>>> c8e685410 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) @@ -9242,6 +9361,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ea8fbcfbe5 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= <<<<<<< HEAD @@ -12775,6 +12895,8 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= @@ -12785,6 +12907,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea <<<<<<< HEAD >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2ac294bf3 (GEOMESA-3071 Move all converter state into evaluation context) <<<<<<< HEAD >>>>>>> 2f79835b1b (GEOMESA-3071 Move all converter state into evaluation context) @@ -13543,6 +13666,8 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea ======= >>>>>>> 455aae09d (GEOMESA-3071 Move all converter state into evaluation context) ======= +>>>>>>> locationtech-main +======= ======= ======= import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} @@ -13550,6 +13675,7 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea >>>>>>> 1c744a07e (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) >>>>>>> a97477799 (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) ======= +<<<<<<< HEAD >>>>>>> 30559ea5c9 (Merge branch 'feature/postgis-fixes') >>>>>>> 404627bdc (GEOMESA-3151 Fix CLI GT dependency versions (#2812)) <<<<<<< HEAD @@ -13725,6 +13851,10 @@ import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, Closea import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +import org.locationtech.geomesa.utils.io.{CloseQuietly, CloseWithLogging, CloseablePool, WithClose} +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main import org.locationtech.geomesa.utils.text.TextTools import org.opengis.feature.simple.{SimpleFeature, SimpleFeatureType} diff --git a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/utils/StorageJobUtils.scala b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/utils/StorageJobUtils.scala index 0198c0f6eab7..367395ce9d11 100644 --- a/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/utils/StorageJobUtils.scala +++ b/geomesa-tools/src/main/scala/org/locationtech/geomesa/tools/utils/StorageJobUtils.scala @@ -17,6 +17,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. @@ -24,6 +27,7 @@ ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -434,6 +438,8 @@ ======= ======= >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -441,6 +447,7 @@ <<<<<<< HEAD >>>>>>> 120815d0b (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b54485f5a2 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD @@ -455,12 +462,15 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> locationtech-main +======= ======= * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb6bda89b6 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD ======= @@ -809,6 +819,8 @@ >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at @@ -821,13 +833,17 @@ package org.locationtech.geomesa.tools.utils <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= +>>>>>>> locationtech-main +======= import java.util.Collections >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -946,6 +962,8 @@ import java.util.Collections >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import com.typesafe.scalalogging.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path @@ -960,6 +978,7 @@ import java.util.Collections <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -1072,6 +1091,10 @@ import java.util.Collections ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main object StorageJobUtils extends LazyLogging { def distCopy( diff --git a/geomesa-utils-parent/geomesa-utils/pom.xml b/geomesa-utils-parent/geomesa-utils/pom.xml index 8575458f1e86..8ee8dbd85b03 100644 --- a/geomesa-utils-parent/geomesa-utils/pom.xml +++ b/geomesa-utils-parent/geomesa-utils/pom.xml @@ -12,6 +12,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= 4.1.0-SNAPSHOT ======= @@ -3098,6 +3099,10 @@ ======= 4.1.0-SNAPSHOT ======= +======= + 4.1.0-SNAPSHOT +======= +>>>>>>> locationtech-main 4.0.0-SNAPSHOT ======= geomesa_2.12 @@ -3108,15 +3113,19 @@ <<<<<<< HEAD >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dca5d74b69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> f9c85b7d5 ([maven-release-plugin] prepare for next development iteration):geomesa-utils/pom.xml <<<<<<< HEAD >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -5466,6 +5475,8 @@ >>>>>>> 05410a7682 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5608,9 +5619,12 @@ <<<<<<< HEAD >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7f02afb594 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -5632,9 +5646,12 @@ <<<<<<< HEAD >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7c58c5ebda ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -5647,9 +5664,12 @@ <<<<<<< HEAD >>>>>>> 1562748d0b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -5671,9 +5691,12 @@ <<<<<<< HEAD >>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -5703,9 +5726,12 @@ <<<<<<< HEAD >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1261eeea04 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -5725,9 +5751,12 @@ <<<<<<< HEAD >>>>>>> 9e7e1887a7 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -5736,9 +5765,12 @@ <<<<<<< HEAD >>>>>>> ab4d758ed7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb50a47408 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -5750,9 +5782,12 @@ <<<<<<< HEAD >>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6d7a215aea ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -5766,9 +5801,12 @@ <<<<<<< HEAD >>>>>>> 0088e6eff1 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -5777,9 +5815,12 @@ <<<<<<< HEAD >>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 02e4b25510 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -5788,9 +5829,12 @@ <<<<<<< HEAD >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) @@ -5799,9 +5843,12 @@ <<<<<<< HEAD >>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 92609167dd ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -5813,9 +5860,12 @@ <<<<<<< HEAD >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -5826,9 +5876,12 @@ <<<<<<< HEAD >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -5837,9 +5890,12 @@ <<<<<<< HEAD >>>>>>> c8e80535d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -5851,9 +5907,12 @@ <<<<<<< HEAD >>>>>>> a0c34ab601 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -5863,9 +5922,12 @@ <<<<<<< HEAD >>>>>>> 59c99fa93a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) @@ -5874,16 +5936,22 @@ <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes'):geomesa-utils/pom.xml >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-utils-parent/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGeneratorTest.scala b/geomesa-utils-parent/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGeneratorTest.scala index 57bf0ea75aaf..bfa6575c8aef 100644 --- a/geomesa-utils-parent/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGeneratorTest.scala +++ b/geomesa-utils-parent/geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGeneratorTest.scala @@ -15,6 +15,7 @@ package org.locationtech.geomesa.utils.uuid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -210,11 +211,14 @@ import java.util.Date >>>>>>> 16f912e1ef (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD ======= +>>>>>>> locationtech-main +======= import java.util.Date >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 120815d0b0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)):geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/uuid/Z3FeatureIdGeneratorTest.scala <<<<<<< HEAD >>>>>>> 87ab0f22da (GEOMESA-3092 Support Lambda NiFi processor (#2777)) @@ -300,6 +304,8 @@ import java.util.Date >>>>>>> locationtech-main ======= >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +>>>>>>> locationtech-main import org.geotools.feature.simple.SimpleFeatureBuilder import org.junit.runner.RunWith import org.locationtech.geomesa.curve.{BinnedTime, TimePeriod} diff --git a/geomesa-utils-parent/geomesa-zk-utils/pom.xml b/geomesa-utils-parent/geomesa-zk-utils/pom.xml index b3b8a0f1d86b..7c7626e4b47a 100644 --- a/geomesa-utils-parent/geomesa-zk-utils/pom.xml +++ b/geomesa-utils-parent/geomesa-zk-utils/pom.xml @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= 4.1.0-SNAPSHOT ======= @@ -2253,6 +2254,10 @@ ======= 4.1.0-SNAPSHOT ======= +======= + 4.1.0-SNAPSHOT +======= +>>>>>>> locationtech-main 4.0.0-SNAPSHOT ======= geomesa_2.12 @@ -2263,15 +2268,19 @@ <<<<<<< HEAD >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dca5d74b69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> f9c85b7d5 ([maven-release-plugin] prepare for next development iteration):geomesa-zk-utils/pom.xml <<<<<<< HEAD >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -4526,6 +4535,8 @@ >>>>>>> 05410a7682 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4668,9 +4679,12 @@ <<<<<<< HEAD >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7f02afb594 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -4692,9 +4706,12 @@ <<<<<<< HEAD >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7c58c5ebda ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -4707,9 +4724,12 @@ <<<<<<< HEAD >>>>>>> 1562748d0b (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -4731,9 +4751,12 @@ <<<<<<< HEAD >>>>>>> 6fb61480e6 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= <<<<<<< HEAD @@ -4763,9 +4786,12 @@ <<<<<<< HEAD >>>>>>> 6b6969a79e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1261eeea04 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -4785,9 +4811,12 @@ <<<<<<< HEAD >>>>>>> 9e7e1887a7 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -4796,9 +4825,12 @@ <<<<<<< HEAD >>>>>>> ab4d758ed7 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> cb50a47408 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -4810,9 +4842,12 @@ <<<<<<< HEAD >>>>>>> 6227aa40aa ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6d7a215aea ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -4826,9 +4861,12 @@ <<<<<<< HEAD >>>>>>> 0088e6eff1 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ef1d7a8022 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -4837,9 +4875,12 @@ <<<<<<< HEAD >>>>>>> a10782e91a ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 02e4b25510 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -4848,9 +4889,12 @@ <<<<<<< HEAD >>>>>>> 5e17a3f871 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) @@ -4859,9 +4903,12 @@ <<<<<<< HEAD >>>>>>> 4819dd631b ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 92609167dd ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -4873,9 +4920,12 @@ <<<<<<< HEAD >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -4886,9 +4936,12 @@ <<<<<<< HEAD >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -4897,9 +4950,12 @@ <<<<<<< HEAD >>>>>>> c8e80535d8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= ======= @@ -4911,9 +4967,12 @@ <<<<<<< HEAD >>>>>>> a0c34ab601 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -4923,9 +4982,12 @@ <<<<<<< HEAD >>>>>>> 59c99fa93a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) @@ -4934,16 +4996,22 @@ <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes'):geomesa-zk-utils/pom.xml >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-utils-parent/geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala b/geomesa-utils-parent/geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala index b6ffd46ef811..64bfadd2c978 100644 --- a/geomesa-utils-parent/geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala +++ b/geomesa-utils-parent/geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala @@ -5,9 +5,12 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD:geomesa-utils-parent/geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala <<<<<<< HEAD:geomesa-utils-parent/geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala ======= +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main * Copyright (c) 2013-2023 Commonwealth Computer Research, Inc. ======= @@ -16,6 +19,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -121,6 +125,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * Copyright (c) 2013-2022 Commonwealth Computer Research, Inc. ======= * Copyright (c) 2013-2021 Commonwealth Computer Research, Inc. @@ -128,6 +134,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD:geomesa-utils-parent/geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala @@ -325,6 +332,8 @@ ======= ======= ======= +======= +>>>>>>> locationtech-main <<<<<<< HEAD:geomesa-utils-parent/geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala >>>>>>> 425a920af (GEOMESA-3113 Add system property to managing HBase deletes with visibilities (#2792)):geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala ======= @@ -333,6 +342,7 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes'):geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1b25d7ddb (Merge branch 'feature/postgis-fixes') >>>>>>> 699117eca9 (Merge branch 'feature/postgis-fixes') >>>>>>> c69897d7bd (Merge branch 'feature/postgis-fixes') @@ -465,6 +475,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes'):geomesa-zk-utils/src/main/scala/org/locationtech/geomesa/utils/zk/CuratorHelper.scala >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main * All rights reserved. This program and the accompanying materials * are made available under the terms of the Apache License, Version 2.0 * which accompanies this distribution and is available at diff --git a/geomesa-web/geomesa-web-core/pom.xml b/geomesa-web/geomesa-web-core/pom.xml index a9af8ccde0bb..40fd8061b2b7 100644 --- a/geomesa-web/geomesa-web-core/pom.xml +++ b/geomesa-web/geomesa-web-core/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-web/geomesa-web-stats/pom.xml b/geomesa-web/geomesa-web-stats/pom.xml index 1e48279321fe..0219ff17f805 100644 --- a/geomesa-web/geomesa-web-stats/pom.xml +++ b/geomesa-web/geomesa-web-stats/pom.xml @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1279,11 +1280,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2390,6 +2394,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2398,6 +2404,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2890,12 +2897,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3271,6 +3285,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3278,12 +3300,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3324,6 +3350,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3337,6 +3368,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3455,11 +3487,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3470,11 +3506,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3618,6 +3657,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3629,6 +3672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3907,6 +3951,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3918,6 +3968,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4065,6 +4116,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4077,6 +4130,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6696,6 +6750,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6792,6 +6848,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8267,6 +8324,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8285,6 +8344,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9780,12 +9840,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12484,6 +12547,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12491,6 +12556,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12533,9 +12599,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14091,6 +14160,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14098,6 +14171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14164,10 +14238,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14185,10 +14284,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14222,19 +14329,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15303,11 +15429,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15325,6 +15456,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-web/pom.xml b/geomesa-web/pom.xml index b1c40bed1405..e86a640460ee 100644 --- a/geomesa-web/pom.xml +++ b/geomesa-web/pom.xml @@ -110,6 +110,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1280,11 +1281,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 3.4.0-SNAPSHOT ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 364812dd7e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -2391,6 +2395,8 @@ ======= >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +>>>>>>> locationtech-main +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) ======= @@ -2399,6 +2405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -2891,12 +2898,19 @@ ======= ======= ======= +>>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3272,6 +3286,14 @@ >>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 72d3ba28f4 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main +======= +======= +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) @@ -3279,12 +3301,16 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> locationtech-main ======= >>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main >>>>>>> 6113b1721c ([maven-release-plugin] prepare for next development iteration) @@ -3325,6 +3351,11 @@ ======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) @@ -3338,6 +3369,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9760e97550 ([maven-release-plugin] prepare for next development iteration) ======= @@ -3456,11 +3488,15 @@ >>>>>>> 2940a115c0 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0c38d97369 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -3471,11 +3507,14 @@ ======= >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3619,6 +3658,10 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= +======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD @@ -3630,6 +3673,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c06bbd3f6c ([maven-release-plugin] prepare for next development iteration) ======= @@ -3908,6 +3952,12 @@ >>>>>>> locationtech-main ======= ======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -3919,6 +3969,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -4066,6 +4117,8 @@ >>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= @@ -4078,6 +4131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6697,6 +6751,8 @@ >>>>>>> 3cf53cae25 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6793,6 +6849,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2ec8fc871d ([maven-release-plugin] prepare for next development iteration) ======= @@ -8268,6 +8325,8 @@ ======= >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= @@ -8286,6 +8345,7 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -9781,12 +9841,15 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -12485,6 +12548,8 @@ >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -12492,6 +12557,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -12534,9 +12600,12 @@ ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) ======= +>>>>>>> locationtech-main +======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD @@ -14092,6 +14161,10 @@ ======= >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) ======= +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) @@ -14099,6 +14172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425d ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> 3cd2b26212 ([maven-release-plugin] prepare for next development iteration) @@ -14165,10 +14239,35 @@ >>>>>>> 065272a744 ([maven-release-plugin] prepare for next development iteration) ======= ======= +======= +======= +======= +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -14186,10 +14285,18 @@ ======= ======= ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 1a54249ab (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> 0c5ed829b ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c22584d751 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 1bb1481207 ([maven-release-plugin] prepare for next development iteration) ======= @@ -14223,19 +14330,38 @@ ======= ======= ======= +======= + 3.4.0-SNAPSHOT +>>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 8f88e57ed (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 8d2851846 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main +======= +======= >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0735939d3a (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 0a51fc4ca6 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> c3f691a25b ([maven-release-plugin] prepare for next development iteration) >>>>>>> 133b321916 ([maven-release-plugin] prepare for next development iteration) ======= @@ -15304,11 +15430,16 @@ >>>>>>> e71de39798 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= +======= +>>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2f78c9d4f5 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -15326,6 +15457,16 @@ 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +>>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) +======= + 3.5.0-SNAPSHOT +>>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') +>>>>>>> locationtech-main 4.0.0 diff --git a/geomesa-z3/pom.xml b/geomesa-z3/pom.xml index cea1fe2d02a7..3ad8f69ea241 100644 --- a/geomesa-z3/pom.xml +++ b/geomesa-z3/pom.xml @@ -114,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -127,11 +128,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6388,6 +6392,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6427,6 +6435,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6445,6 +6454,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6459,6 +6470,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6466,12 +6478,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6483,10 +6498,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6506,6 +6524,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6525,11 +6550,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6541,6 +6569,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6548,19 +6577,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6568,10 +6603,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6579,12 +6617,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6678,6 +6719,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6707,6 +6750,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6809,6 +6853,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6826,14 +6874,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6851,6 +6903,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6859,6 +6913,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6874,9 +6929,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7037,6 +7095,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7182,6 +7242,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9227,12 +9288,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11231,6 +11295,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.0.0 diff --git a/include/proj/CMakeLists.txt b/include/proj/CMakeLists.txt index c1f0aa1f7ef0..b350e35d0488 100644 --- a/include/proj/CMakeLists.txt +++ b/include/proj/CMakeLists.txt @@ -6,6 +6,7 @@ install( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -125,6 +126,9 @@ install( ======= FILES util.hpp metadata.hpp common.hpp crs.hpp datum.hpp >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + FILES util.hpp metadata.hpp common.hpp crs.hpp datum.hpp +>>>>>>> locationtech-main coordinatesystem.hpp coordinateoperation.hpp io.hpp nn.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/proj ) diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp index c88a163d8423..0092369add69 100644 --- a/include/proj/coordinateoperation.hpp +++ b/include/proj/coordinateoperation.hpp @@ -56,6 +56,7 @@ class ProjectedCRS; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -188,6 +189,8 @@ using CoordinateMetadataNNPtr = util::nn; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** osgeo.proj.operation namespace \brief Coordinate operations (relationship between any two coordinate @@ -340,6 +343,7 @@ class PROJ_GCC_DLL CoordinateOperation : public common::ObjectUsage, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -471,6 +475,8 @@ class PROJ_GCC_DLL CoordinateOperation : public common::ObjectUsage, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main setProperties(const util::PropertyMap &properties); // throw(InvalidValueTypeException) @@ -1229,6 +1235,7 @@ class PROJ_GCC_DLL Conversion : public SingleOperation { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1360,6 +1367,8 @@ class PROJ_GCC_DLL Conversion : public SingleOperation { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_DLL static ConversionNNPtr createAlbersEqualArea(const util::PropertyMap &properties, const common::Angle &latitudeFalseOrigin, @@ -1801,6 +1810,7 @@ class PROJ_GCC_DLL Conversion : public SingleOperation { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1977,6 +1987,8 @@ class PROJ_GCC_DLL Conversion : public SingleOperation { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const common::Angle &offsetLon); PROJ_DLL static ConversionNNPtr createGeographic3DOffsets( @@ -1988,6 +2000,7 @@ class PROJ_GCC_DLL Conversion : public SingleOperation { const common::Angle &offsetLon, const common::Length &offsetHeight); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -2010,6 +2023,8 @@ class PROJ_GCC_DLL Conversion : public SingleOperation { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_DLL static ConversionNNPtr createVerticalOffset(const util::PropertyMap &properties, @@ -2212,6 +2227,7 @@ class PROJ_GCC_DLL Transformation : public SingleOperation { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2334,6 +2350,9 @@ class PROJ_GCC_DLL Transformation : public SingleOperation { ======= const common::Angle &offsetLon, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon, +>>>>>>> locationtech-main const std::vector &accuracies); PROJ_DLL static TransformationNNPtr createGeographic3DOffsets( @@ -2346,6 +2365,7 @@ class PROJ_GCC_DLL Transformation : public SingleOperation { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2468,6 +2488,9 @@ class PROJ_GCC_DLL Transformation : public SingleOperation { ======= const common::Angle &offsetLon, const common::Length &offsetHeight, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon, const common::Length &offsetHeight, +>>>>>>> locationtech-main const std::vector &accuracies); PROJ_DLL static TransformationNNPtr createGeographic2DWithHeightOffsets( @@ -2480,6 +2503,7 @@ class PROJ_GCC_DLL Transformation : public SingleOperation { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2602,6 +2626,9 @@ class PROJ_GCC_DLL Transformation : public SingleOperation { ======= const common::Angle &offsetLon, const common::Length &offsetHeight, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon, const common::Length &offsetHeight, +>>>>>>> locationtech-main const std::vector &accuracies); PROJ_DLL static TransformationNNPtr createVerticalOffset( @@ -2912,6 +2939,7 @@ class PROJ_GCC_DLL CoordinateOperationContext { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3050,6 +3078,8 @@ class PROJ_GCC_DLL CoordinateOperationContext { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_DLL static CoordinateOperationContextNNPtr create(const io::AuthorityFactoryPtr &authorityFactory, const metadata::ExtentPtr &extent, double accuracy); @@ -3061,6 +3091,7 @@ class PROJ_GCC_DLL CoordinateOperationContext { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3221,6 +3252,10 @@ class PROJ_GCC_DLL CoordinateOperationContext { protected: PROJ_INTERNAL CoordinateOperationContext(); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + protected: + PROJ_INTERNAL CoordinateOperationContext(); +>>>>>>> locationtech-main INLINED_MAKE_UNIQUE private: @@ -3265,6 +3300,7 @@ class PROJ_GCC_DLL CoordinateOperationFactory { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3401,6 +3437,8 @@ class PROJ_GCC_DLL CoordinateOperationFactory { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_DLL static CoordinateOperationFactoryNNPtr create(); protected: diff --git a/include/proj/coordinatesystem.hpp b/include/proj/coordinatesystem.hpp index 3d3adcc4d9c5..73736c712098 100644 --- a/include/proj/coordinatesystem.hpp +++ b/include/proj/coordinatesystem.hpp @@ -117,6 +117,7 @@ class AxisDirection : public util::CodeList { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -271,6 +272,8 @@ class RangeMeaning : public util::CodeList { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main class Meridian; /** Shared pointer of Meridian. */ using MeridianPtr = std::shared_ptr; @@ -348,6 +351,7 @@ class PROJ_GCC_DLL CoordinateSystemAxis final : public common::IdentifiedObject, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD PROJ_DLL const util::optional &rangeMeaning() PROJ_PURE_DECL; ======= @@ -453,6 +457,8 @@ class PROJ_GCC_DLL CoordinateSystemAxis final : public common::IdentifiedObject, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_DLL const MeridianPtr &meridian() PROJ_PURE_DECL; // Non-standard @@ -469,6 +475,7 @@ class PROJ_GCC_DLL CoordinateSystemAxis final : public common::IdentifiedObject, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -604,6 +611,8 @@ class PROJ_GCC_DLL CoordinateSystemAxis final : public common::IdentifiedObject, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_PRIVATE : //! @cond Doxygen_Suppress diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp index 1a41420770b1..0b9d74660df9 100644 --- a/include/proj/crs.hpp +++ b/include/proj/crs.hpp @@ -102,6 +102,7 @@ class PROJ_GCC_DLL CRS : public common::ObjectUsage, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD PROJ_DLL bool isDynamic(bool considerWGS84AsDynamic = false) const; ======= @@ -207,6 +208,8 @@ class PROJ_GCC_DLL CRS : public common::ObjectUsage, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_DLL GeodeticCRSPtr extractGeodeticCRS() const; PROJ_DLL GeographicCRSPtr extractGeographicCRS() const; PROJ_DLL VerticalCRSPtr extractVerticalCRS() const; diff --git a/include/proj/datum.hpp b/include/proj/datum.hpp index 2da13872530d..90960b4c5568 100644 --- a/include/proj/datum.hpp +++ b/include/proj/datum.hpp @@ -75,6 +75,7 @@ class PROJ_GCC_DLL Datum : public common::ObjectUsage, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD PROJ_DLL const util::optional &anchorEpoch() const; ======= @@ -180,6 +181,8 @@ class PROJ_GCC_DLL Datum : public common::ObjectUsage, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_DLL const util::optional &publicationDate() const; PROJ_DLL const common::IdentifiedObjectPtr &conventionalRS() const; @@ -209,6 +212,7 @@ class PROJ_GCC_DLL Datum : public common::ObjectUsage, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -323,6 +327,8 @@ class PROJ_GCC_DLL Datum : public common::ObjectUsage, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_INTERNAL void setProperties(const util::PropertyMap @@ -653,6 +659,7 @@ class PROJ_GCC_DLL GeodeticReferenceFrame : public Datum { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -785,6 +792,8 @@ class PROJ_GCC_DLL GeodeticReferenceFrame : public Datum { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_DLL static const GeodeticReferenceFrameNNPtr EPSG_6267; // North American Datum 1927 PROJ_DLL static const GeodeticReferenceFrameNNPtr @@ -962,6 +971,7 @@ class PROJ_GCC_DLL VerticalReferenceFrame : public Datum { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1095,6 +1105,8 @@ class PROJ_GCC_DLL VerticalReferenceFrame : public Datum { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main //! @cond Doxygen_Suppress PROJ_INTERNAL bool _isEquivalentTo( const util::IComparable *other, diff --git a/include/proj/internal/io_internal.hpp b/include/proj/internal/io_internal.hpp index 3307e18efdb1..a10b42f92870 100644 --- a/include/proj/internal/io_internal.hpp +++ b/include/proj/internal/io_internal.hpp @@ -92,6 +92,7 @@ class WKTConstants { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD static const std::string ANCHOREPOCH; // WKT2-2019 ======= @@ -197,6 +198,8 @@ class WKTConstants { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main static const std::string CONVERSION; static const std::string METHOD; static const std::string REMARK; @@ -254,6 +257,7 @@ class WKTConstants { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -405,6 +409,9 @@ class WKTConstants { ======= static const std::string GEOIDMODEL; // WKT2-2019 >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + static const std::string GEOIDMODEL; // WKT2-2019 +>>>>>>> locationtech-main // WKT2 alternate (longer or shorter) static const std::string GEODETICCRS; diff --git a/include/proj/internal/vendor/nlohmann/json.hpp b/include/proj/internal/vendor/nlohmann/json.hpp index 77726eb0d773..ced011285825 100644 --- a/include/proj/internal/vendor/nlohmann/json.hpp +++ b/include/proj/internal/vendor/nlohmann/json.hpp @@ -5149,6 +5149,7 @@ auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5271,6 +5272,9 @@ auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) ======= // It's required so that expressions like {ptr, len} can be implicitely casted >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +// It's required so that expressions like {ptr, len} can be implicitely casted +>>>>>>> locationtech-main // to the correct adapter. class span_input_adapter { @@ -10051,6 +10055,7 @@ class binary_reader <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10173,6 +10178,9 @@ class binary_reader ======= @note This function needs to respect the system's endianess, because >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + @note This function needs to respect the system's endianess, because +>>>>>>> locationtech-main bytes in CBOR, MessagePack, and UBJSON are stored in network order (big endian) and therefore need reordering on little endian systems. */ @@ -10351,6 +10359,7 @@ class binary_reader <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10473,6 +10482,9 @@ class binary_reader ======= /// whether we can assume little endianess >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + /// whether we can assume little endianess +>>>>>>> locationtech-main const bool is_little_endian = little_endianess(); /// the SAX parser @@ -14618,6 +14630,7 @@ class binary_writer <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14740,6 +14753,9 @@ class binary_writer ======= @note This function needs to respect the system's endianess, because bytes >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + @note This function needs to respect the system's endianess, because bytes +>>>>>>> locationtech-main in CBOR, MessagePack, and UBJSON are stored in network order (big endian) and therefore need reordering on little endian systems. */ @@ -14829,6 +14845,7 @@ class binary_writer <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14951,6 +14968,9 @@ class binary_writer ======= /// whether we can assume little endianess >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + /// whether we can assume little endianess +>>>>>>> locationtech-main const bool is_little_endian = little_endianess(); /// the output @@ -18032,6 +18052,7 @@ class basic_json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -18154,6 +18175,9 @@ class basic_json ======= The subtype is then added as singed 8-bit integer. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + The subtype is then added as singed 8-bit integer. +>>>>>>> locationtech-main - If no subtype is given, the bin family (bin8, bin16, bin32) is used. - BSON - If a subtype is given, it is used and added as unsigned 8-bit integer. @@ -22112,6 +22136,7 @@ class basic_json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -22234,6 +22259,9 @@ class basic_json ======= object's lifetime exeeds the iteration. See >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + object's lifetime exeeds the iteration. See +>>>>>>> locationtech-main for more information. diff --git a/include/proj/util.hpp b/include/proj/util.hpp index 372bf46f6433..502bd80c8f8e 100644 --- a/include/proj/util.hpp +++ b/include/proj/util.hpp @@ -40,6 +40,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -162,6 +163,9 @@ ======= // windows.h can confict with Criterion::STRICT >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +// windows.h can confict with Criterion::STRICT +>>>>>>> locationtech-main #ifdef STRICT #undef STRICT #endif diff --git a/pom.xml b/pom.xml index d1c0a1033229..149575dc04ca 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2b4c7c20fe ([maven-release-plugin] prepare for next development iteration) @@ -133,11 +134,14 @@ >>>>>>> 6094f098d8 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= 3.3.0-SNAPSHOT >>>>>>> cf42b98f8f (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= +<<<<<<< HEAD >>>>>>> d0052cffb4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) 3.4.0-SNAPSHOT ======= @@ -6394,6 +6398,10 @@ >>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD +======= + 3.4.0-SNAPSHOT +>>>>>>> a084f35ebb ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main ======= ======= >>>>>>> c009eb5e7f ([maven-release-plugin] prepare for next development iteration) @@ -6433,6 +6441,7 @@ >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') 3.4.0-SNAPSHOT ======= +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> location-main @@ -6451,6 +6460,8 @@ >>>>>>> 1f8411bc8 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6465,6 +6476,7 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6472,12 +6484,15 @@ >>>>>>> d16129f1bd (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> b6c4628db (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6489,10 +6504,13 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6512,6 +6530,13 @@ >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) ======= >>>>>>> 7e86ea6e07 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) +>>>>>>> locationtech-main <<<<<<< HEAD >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) ======= @@ -6531,11 +6556,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 059393960 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD @@ -6547,6 +6575,7 @@ ======= >>>>>>> 5e8ce12ec (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6554,19 +6583,25 @@ >>>>>>> d30d93daf5 ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 8a73cc043 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> f3dd0ac67 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6574,10 +6609,13 @@ >>>>>>> ec5328ba69 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) >>>>>>> 9a1ca2afc (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6585,12 +6623,15 @@ >>>>>>> d8f34add8e ([maven-release-plugin] prepare for next development iteration) >>>>>>> locationtech-main ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6684,6 +6725,8 @@ ======= >>>>>>> 61d746ac2 ([maven-release-plugin] prepare for next development iteration) >>>>>>> 5a28b052cf ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> locationtech-main 3.5.0-SNAPSHOT ======= 3.3.0-SNAPSHOT @@ -6713,6 +6756,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> aada4d63c (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD >>>>>>> 09ccf06d4 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) @@ -6815,6 +6859,10 @@ ======= >>>>>>> locationtech-main ======= +======= +======= +======= +>>>>>>> locationtech-main >>>>>>> 04c5bd425 ([maven-release-plugin] prepare for next development iteration) ======= ======= @@ -6832,14 +6880,18 @@ ======= <<<<<<< HEAD >>>>>>> 7cd2c4188 (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +<<<<<<< HEAD ======= >>>>>>> d9f1fc9bca (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) +======= +>>>>>>> locationtech-main >>>>>>> 6ed35b9ff (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> location-main ======= @@ -6857,6 +6909,8 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> locationtech-main >>>>>>> 1f8411bc8e (GEOMESA-3076 Do inexact checking for cardinality values in minmax stat) ======= ======= @@ -6865,6 +6919,7 @@ ======= >>>>>>> dbcf5b0db ([maven-release-plugin] prepare for next development iteration) >>>>>>> 4ce91569fa ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -6880,9 +6935,12 @@ >>>>>>> c599e64ec ([maven-release-plugin] prepare for next development iteration) ======= ======= +>>>>>>> locationtech-main +======= ======= 3.4.0-SNAPSHOT >>>>>>> 5792d822c ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD ======= ======= >>>>>>> a0acb9872b ([maven-release-plugin] prepare for next development iteration) @@ -7043,6 +7101,8 @@ <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> locationtech-main >>>>>>> fb47f5073 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD <<<<<<< HEAD @@ -7188,6 +7248,7 @@ >>>>>>> a0515b751 ([maven-release-plugin] prepare for next development iteration) <<<<<<< HEAD >>>>>>> e886d343d7 ([maven-release-plugin] prepare for next development iteration) +<<<<<<< HEAD >>>>>>> locationtech-main ======= ======= @@ -9233,12 +9294,15 @@ ======= >>>>>>> 67de3c3202 (Merge branch 'feature/postgis-fixes') ======= +>>>>>>> locationtech-main +======= ======= 3.5.0-SNAPSHOT >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') ======= ======= @@ -11237,6 +11301,8 @@ >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main @@ -11672,6 +11738,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= -Xms512m -Xmx4g -XX:-UseGCOverheadLimit -XX:MaxJavaStackTraceDepth=1000000 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) @@ -11791,6 +11858,11 @@ -Xms512m -Xmx4g -XX:-UseGCOverheadLimit -XX:MaxJavaStackTraceDepth=1000000 >>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) >>>>>>> 537a54b7ef (GEOMESA-3071 Move all converter state into evaluation context) +======= +======= + -Xms512m -Xmx4g -XX:-UseGCOverheadLimit -XX:MaxJavaStackTraceDepth=1000000 +>>>>>>> 1ba2f23b3 (GEOMESA-3071 Move all converter state into evaluation context) +>>>>>>> locationtech-main 4 true @@ -12005,6 +12077,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -12763,6 +12836,61 @@ ======= 4.0.4 >>>>>>> b5eea5d60a (Set latest release version to 4.0.4) +======= + 4.0.4 +======= +======= +>>>>>>> 86fd3375c0 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 08ec6e9fa0 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 6d17d625fd ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> c1f99f4bcb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> c3c5dd0ebb (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 737fb2cb2c ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 60ee91581e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> ab3b2c49db ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 338d952d43 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 4c361f07da (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 20da909f0e ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> c558052945 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 417ad813eb ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 9627a2de6a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> f302a54949 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 90d3ad4920 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> bb1e627b99 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 8d80a87f7e ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 76908c410a (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> a788dfac03 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> a801bb2986 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> 60b2734c49 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +======= +>>>>>>> 40961a9e73 ([maven-release-plugin] prepare for next development iteration) +======= +>>>>>>> da00c7bd68 (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD + 4.0.0 +>>>>>>> f0b9bd8121 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) +>>>>>>> locationtech-main 4.1.0-SNAPSHOT ======= ======= @@ -12814,6 +12942,7 @@ ======= >>>>>>> 1b25d7ddb4 (Merge branch 'feature/postgis-fixes') <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -13156,16 +13285,21 @@ >>>>>>> 3c071a6b3e (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) >>>>>>> 1aa0b19c24 (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +======= +>>>>>>> locationtech-main 3.5.0 4.0.0-SNAPSHOT <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main >>>>>>> 6d9a5b626c (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= <<<<<<< HEAD @@ -13175,6 +13309,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -18719,6 +18854,8 @@ 2023 ======= ======= +>>>>>>> locationtech-main +======= ======= <<<<<<< HEAD 3.3.0 @@ -19093,13 +19230,19 @@ <<<<<<< HEAD >>>>>>> d9ed077cd (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 66dbbce00d (GEOMESA-3061 Converters - support bytes in Avro top-level union types (#2762)) ======= ======= +>>>>>>> locationtech-main +======= ======= >>>>>>> 3be8d2a5a (Merge branch 'feature/postgis-fixes') >>>>>>> db8d998aa (Merge branch 'feature/postgis-fixes') +<<<<<<< HEAD >>>>>>> 64eaf6b132 (Merge branch 'feature/postgis-fixes') +======= +>>>>>>> locationtech-main <<<<<<< HEAD @@ -23151,6 +23294,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) ======= @@ -23263,6 +23407,10 @@ ======= >>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) >>>>>>> 1a04676d44 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +======= +======= +>>>>>>> 51a90e7f0 (GEOMESA-3092 Support Lambda NiFi processor (#2777)) +>>>>>>> locationtech-main org.apache.thrift diff --git a/schemas/v0.6/projjson.schema.json b/schemas/v0.6/projjson.schema.json index 2bd633be993c..641fce0ac231 100644 --- a/schemas/v0.6/projjson.schema.json +++ b/schemas/v0.6/projjson.schema.json @@ -18,6 +18,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -157,6 +158,9 @@ ======= { "$ref": "#/definitions/concatenated_operation" } >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + { "$ref": "#/definitions/concatenated_operation" } +>>>>>>> locationtech-main ], "definitions": { @@ -243,6 +247,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -370,6 +375,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "id": { "$ref": "#/definitions/id" }, "ids": { "$ref": "#/definitions/ids" } }, @@ -494,6 +501,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -632,6 +640,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "coordinate_system": { "type": "object", "properties": { @@ -896,6 +906,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "anchor_epoch": {}, ======= @@ -1001,6 +1012,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "ellipsoid": {}, "prime_meridian": {}, "frame_reference_epoch": { "type": "number" }, @@ -1031,6 +1044,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "anchor_epoch": {}, ======= @@ -1136,6 +1150,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "frame_reference_epoch": { "type": "number" }, "$schema" : {}, "scope": {}, @@ -1290,6 +1306,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "anchor_epoch": { "type": "number" }, ======= @@ -1395,6 +1412,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "ellipsoid": { "$ref": "#/definitions/ellipsoid" }, "prime_meridian": { "$ref": "#/definitions/prime_meridian" }, "$schema" : {}, @@ -1897,6 +1916,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "anchor_epoch": { "type": "number" }, ======= @@ -2002,6 +2022,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "$schema" : {}, "scope": {}, "area": {}, diff --git a/scripts/build_db.py b/scripts/build_db.py index 96cbbf646508..da5d25d3d2e3 100755 --- a/scripts/build_db.py +++ b/scripts/build_db.py @@ -755,6 +755,7 @@ def fill_grid_transformation(proj_db_cursor): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -880,6 +881,10 @@ def fill_grid_transformation(proj_db_cursor): # NOTE: update src/iso19111/operation/transformation.cpp if adding # new methods >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + # NOTE: update src/iso19111/operation/transformation.cpp if adding + # new methods +>>>>>>> locationtech-main # 1071: Vertical Offset by Grid Interpolation (NZLVD) # 1080: Vertical Offset by Grid Interpolation (BEV AT) # 1081: Geographic3D to GravityRelatedHeight (BEV AT) @@ -911,6 +916,7 @@ def fill_grid_transformation(proj_db_cursor): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1060,6 +1066,9 @@ def fill_grid_transformation(proj_db_cursor): ======= elif method_code in (1071, 1080, 1081, 1083, 1084, 1085, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1100, 1101, 1103, 1105, 1110, 1112, 1115) and n_params == 2: >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + elif method_code in (1071, 1080, 1081, 1083, 1084, 1085, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1100, 1101, 1103, 1105, 1110, 1112, 1115) and n_params == 2: +>>>>>>> locationtech-main assert param_code[1] == 1048, (code, method_code, param_code[1]) interpolation_crs_auth_name = EPSG_AUTHORITY interpolation_crs_code = str(int(param_value[1])) # needed to avoid codes like XXXX.0 diff --git a/scripts/build_db_from_esri.py b/scripts/build_db_from_esri.py index 42eb69c5725e..c56ed6baa71a 100755 --- a/scripts/build_db_from_esri.py +++ b/scripts/build_db_from_esri.py @@ -562,6 +562,7 @@ def import_geogcs(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -699,6 +700,8 @@ def import_geogcs(): >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if authority == 'EPSG': map_geogcs_esri_name_to_auth_code[esri_name] = [ @@ -1410,6 +1413,7 @@ def import_projcs(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1547,6 +1551,8 @@ def import_projcs(): >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if authority == 'EPSG': map_projcs_esri_name_to_auth_code[esri_name] = [ @@ -1894,6 +1900,7 @@ def import_vertcs(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2031,6 +2038,8 @@ def import_vertcs(): >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if authority == 'EPSG': map_vertcs_esri_name_to_auth_code[esri_name] = [ @@ -2131,6 +2140,7 @@ def import_vertcs(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2291,6 +2301,11 @@ def import_vertcs(): vertical_unit = parsed_wkt2['VERTCRS'][1]['AXIS'][2]['UNIT_NAME'] >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + assert parsed_wkt2['VERTCRS'][1]['AXIS'][:2] == ['Gravity-related height (H)', 'up'], 'Unhandled vertcrs AXIS: {}'.format(parsed_wkt2['VERTCRS'][1]['AXIS']) + + vertical_unit = parsed_wkt2['VERTCRS'][1]['AXIS'][2]['UNIT_NAME'] +>>>>>>> locationtech-main cs_auth = 'EPSG' if vertical_unit == 'Meter': cs_code = 6499 @@ -2308,6 +2323,7 @@ def import_vertcs(): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2430,6 +2446,9 @@ def import_vertcs(): ======= if not is_vdatum: >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if not is_vdatum: +>>>>>>> locationtech-main assert cs_code == 6499 cs_auth = 'ESRI' cs_code = 'ELLPS_HEIGHT_METRE' diff --git a/scripts/ci/conda/setup.sh b/scripts/ci/conda/setup.sh index 0ac68b833d5f..2125b37435e4 100755 --- a/scripts/ci/conda/setup.sh +++ b/scripts/ci/conda/setup.sh @@ -20,6 +20,7 @@ source: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD patches: ======= @@ -125,6 +126,8 @@ source: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main build: number: 2112 diff --git a/scripts/fix_typos.sh b/scripts/fix_typos.sh index 2150b3b475f6..c9f96b9e661f 100755 --- a/scripts/fix_typos.sh +++ b/scripts/fix_typos.sh @@ -53,6 +53,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -175,6 +176,9 @@ EXCLUDED_FILES="*configure,config.status,config.sub,*/autom4te.cache/*,libtool,a ======= EXCLUDED_FILES="*configure,config.status,config.sub,*/autom4te.cache/*,libtool,aclocal.m4,depcomp,ltmain.sh,*.pdf,./m4/*,./fix_typos/*,./docs/build/*,./src/*generated*,./test/googletest/*,./include/proj/internal/nlohmann/json.hpp,*.before_reformat,./test/cli/test27,./test/cli/test83,./test/cli/pj_out27.dist,./test/cli/pj_out83.dist" >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +EXCLUDED_FILES="*configure,config.status,config.sub,*/autom4te.cache/*,libtool,aclocal.m4,depcomp,ltmain.sh,*.pdf,./m4/*,./fix_typos/*,./docs/build/*,./src/*generated*,./test/googletest/*,./include/proj/internal/nlohmann/json.hpp,*.before_reformat,./test/cli/test27,./test/cli/test83,./test/cli/pj_out27.dist,./test/cli/pj_out83.dist" +>>>>>>> locationtech-main WORDS_WHITE_LIST="metres,als,lsat,twon,ang,PJD_ERR_LSAT_NOT_IN_RANGE,COLOR_GRAT,interm,Interm,Cartesian,cartesian,CARTESIAN,kilometre,centimetre,millimetre,millimetres,Australia,LINZ,LaTeX,BibTeX" python3 fix_typos/codespell/codespell.py -w -i 3 -q 2 -S $EXCLUDED_FILES \ diff --git a/scripts/reference_exported_symbols.txt b/scripts/reference_exported_symbols.txt index adf1579add8d..f9b9d1568cd8 100644 --- a/scripts/reference_exported_symbols.txt +++ b/scripts/reference_exported_symbols.txt @@ -99,6 +99,7 @@ osgeo::proj::common::UnitOfMeasure::UnitOfMeasure(std::string const&, double, os <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -231,6 +232,8 @@ osgeo::proj::coordinates::CoordinateMetadata::crs() const >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::crs::BoundCRS::baseCRS() const osgeo::proj::crs::BoundCRS::baseCRSWithCanonicalBoundCRS() const osgeo::proj::crs::BoundCRS::~BoundCRS() @@ -264,6 +267,7 @@ osgeo::proj::crs::CRS::identify(std::shared_ptr>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::crs::CRS::normalizeForVisualization() const osgeo::proj::crs::CRS::promoteTo3D(std::string const&, std::shared_ptr const&) const osgeo::proj::crs::CRS::shallowClone() const @@ -460,6 +466,7 @@ osgeo::proj::cs::CoordinateSystemAxis::~CoordinateSystemAxis() <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD osgeo::proj::cs::CoordinateSystemAxis::create(osgeo::proj::util::PropertyMap const&, std::string const&, osgeo::proj::cs::AxisDirection const&, osgeo::proj::common::UnitOfMeasure const&, osgeo::proj::util::optional const&, osgeo::proj::util::optional const&, osgeo::proj::util::optional const&, std::shared_ptr const&) ======= <<<<<<< HEAD @@ -564,6 +571,8 @@ osgeo::proj::cs::CoordinateSystemAxis::create(osgeo::proj::util::PropertyMap con >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::cs::CoordinateSystemAxis::create(osgeo::proj::util::PropertyMap const&, std::string const&, osgeo::proj::cs::AxisDirection const&, osgeo::proj::common::UnitOfMeasure const&, std::shared_ptr const&) osgeo::proj::cs::CoordinateSystemAxis::direction() const osgeo::proj::cs::CoordinateSystem::axisList() const @@ -577,6 +586,7 @@ osgeo::proj::cs::CoordinateSystemAxis::minimumValue() const <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD osgeo::proj::cs::CoordinateSystemAxis::rangeMeaning() const ======= <<<<<<< HEAD @@ -681,6 +691,8 @@ osgeo::proj::cs::CoordinateSystemAxis::rangeMeaning() const >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::cs::CoordinateSystemAxis::unit() const osgeo::proj::cs::CoordinateSystem::~CoordinateSystem() osgeo::proj::cs::DateTimeTemporalCS::create(osgeo::proj::util::PropertyMap const&, dropbox::oxygen::nn > const&) @@ -706,6 +718,7 @@ osgeo::proj::cs::ParametricCS::~ParametricCS() <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD osgeo::proj::cs::RangeMeaning::valueOf(std::string const&) ======= <<<<<<< HEAD @@ -810,6 +823,8 @@ osgeo::proj::cs::RangeMeaning::valueOf(std::string const&) >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::cs::SphericalCS::create(osgeo::proj::util::PropertyMap const&, dropbox::oxygen::nn > const&, dropbox::oxygen::nn > const&) osgeo::proj::cs::SphericalCS::create(osgeo::proj::util::PropertyMap const&, dropbox::oxygen::nn > const&, dropbox::oxygen::nn > const&, dropbox::oxygen::nn > const&) osgeo::proj::cs::SphericalCS::~SphericalCS() @@ -829,6 +844,7 @@ osgeo::proj::datum::Datum::anchorDefinition() const <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD osgeo::proj::datum::Datum::anchorEpoch() const ======= <<<<<<< HEAD @@ -933,6 +949,8 @@ osgeo::proj::datum::Datum::anchorEpoch() const >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::datum::Datum::conventionalRS() const osgeo::proj::datum::Datum::~Datum() osgeo::proj::datum::DatumEnsemble::asDatum(std::shared_ptr const&) const @@ -973,6 +991,7 @@ osgeo::proj::datum::GeodeticReferenceFrame::create(osgeo::proj::util::PropertyMa <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD osgeo::proj::datum::GeodeticReferenceFrame::create(osgeo::proj::util::PropertyMap const&, dropbox::oxygen::nn > const&, osgeo::proj::util::optional const&, osgeo::proj::util::optional const&, dropbox::oxygen::nn > const&) ======= <<<<<<< HEAD @@ -1077,6 +1096,8 @@ osgeo::proj::datum::GeodeticReferenceFrame::create(osgeo::proj::util::PropertyMa >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::datum::GeodeticReferenceFrame::ellipsoid() const osgeo::proj::datum::GeodeticReferenceFrame::~GeodeticReferenceFrame() osgeo::proj::datum::GeodeticReferenceFrame::hasEquivalentNameToUsingAlias(osgeo::proj::common::IdentifiedObject const*, std::shared_ptr const&) const @@ -1099,6 +1120,7 @@ osgeo::proj::datum::TemporalDatum::temporalOrigin() const <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD osgeo::proj::datum::VerticalReferenceFrame::create(osgeo::proj::util::PropertyMap const&, osgeo::proj::util::optional const&, osgeo::proj::util::optional const&, osgeo::proj::util::optional const&) ======= <<<<<<< HEAD @@ -1203,6 +1225,8 @@ osgeo::proj::datum::VerticalReferenceFrame::create(osgeo::proj::util::PropertyMa >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::datum::VerticalReferenceFrame::create(osgeo::proj::util::PropertyMap const&, osgeo::proj::util::optional const&, osgeo::proj::util::optional const&) osgeo::proj::datum::VerticalReferenceFrame::realizationMethod() const osgeo::proj::datum::VerticalReferenceFrame::~VerticalReferenceFrame() @@ -1516,6 +1540,7 @@ osgeo::proj::operation::Conversion::createTunisiaMappingGrid(osgeo::proj::util:: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD osgeo::proj::operation::Conversion::createTunisiaMiningGrid(osgeo::proj::util::PropertyMap const&, osgeo::proj::common::Angle const&, osgeo::proj::common::Angle const&, osgeo::proj::common::Length const&, osgeo::proj::common::Length const&) ======= <<<<<<< HEAD @@ -1620,6 +1645,8 @@ osgeo::proj::operation::Conversion::createTunisiaMiningGrid(osgeo::proj::util::P >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::operation::Conversion::createTwoPointEquidistant(osgeo::proj::util::PropertyMap const&, osgeo::proj::common::Angle const&, osgeo::proj::common::Angle const&, osgeo::proj::common::Angle const&, osgeo::proj::common::Angle const&, osgeo::proj::common::Length const&, osgeo::proj::common::Length const&) osgeo::proj::operation::Conversion::createUTM(osgeo::proj::util::PropertyMap const&, int, bool) osgeo::proj::operation::Conversion::createVanDerGrinten(osgeo::proj::util::PropertyMap const&, osgeo::proj::common::Angle const&, osgeo::proj::common::Length const&, osgeo::proj::common::Length const&) @@ -1642,6 +1669,7 @@ osgeo::proj::operation::Conversion::isUTM(int&, bool&) const <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD osgeo::proj::operation::CoordinateOperationContext::clone() const ======= <<<<<<< HEAD @@ -1746,6 +1774,8 @@ osgeo::proj::operation::CoordinateOperationContext::clone() const >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::operation::CoordinateOperationContext::~CoordinateOperationContext() osgeo::proj::operation::CoordinateOperationContext::create(std::shared_ptr const&, std::shared_ptr const&, double) osgeo::proj::operation::CoordinateOperationContext::getAllowBallparkTransformations() const @@ -1764,6 +1794,7 @@ osgeo::proj::operation::CoordinateOperationContext::getSourceAndTargetCRSExtentU <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1906,6 +1937,9 @@ osgeo::proj::operation::CoordinateOperationContext::getSpatialCriterion() const ======= osgeo::proj::operation::CoordinateOperationContext::getSpatialCriterion() const >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +osgeo::proj::operation::CoordinateOperationContext::getSpatialCriterion() const +>>>>>>> locationtech-main osgeo::proj::operation::CoordinateOperationContext::getUsePROJAlternativeGridNames() const osgeo::proj::operation::CoordinateOperationContext::setAllowBallparkTransformations(bool) osgeo::proj::operation::CoordinateOperationContext::setAllowUseIntermediateCRS(osgeo::proj::operation::CoordinateOperationContext::IntermediateCRSUse) @@ -1922,6 +1956,7 @@ osgeo::proj::operation::CoordinateOperationContext::setSourceAndTargetCRSExtentU <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2064,6 +2099,9 @@ osgeo::proj::operation::CoordinateOperationContext::setSpatialCriterion(osgeo::p ======= osgeo::proj::operation::CoordinateOperationContext::setSpatialCriterion(osgeo::proj::operation::CoordinateOperationContext::SpatialCriterion) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +osgeo::proj::operation::CoordinateOperationContext::setSpatialCriterion(osgeo::proj::operation::CoordinateOperationContext::SpatialCriterion) +>>>>>>> locationtech-main osgeo::proj::operation::CoordinateOperationContext::setUsePROJAlternativeGridNames(bool) osgeo::proj::operation::CoordinateOperation::~CoordinateOperation() osgeo::proj::operation::CoordinateOperation::coordinateOperationAccuracies() const @@ -2077,6 +2115,7 @@ osgeo::proj::operation::CoordinateOperationFactory::createOperation(dropbox::oxy <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2191,6 +2230,8 @@ osgeo::proj::operation::CoordinateOperationFactory::createOperations(dropbox::ox >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main osgeo::proj::operation::CoordinateOperationFactory::createOperations(dropbox::oxygen::nn > const&, dropbox::oxygen::nn > const&, dropbox::oxygen::nn > > const&) const osgeo::proj::operation::CoordinateOperation::hasBallparkTransformation() const osgeo::proj::operation::CoordinateOperation::interpolationCRS() const @@ -2399,6 +2440,7 @@ proj_coord_error() <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD proj_coordinate_metadata_get_epoch ======= <<<<<<< HEAD @@ -2503,6 +2545,8 @@ proj_coordinate_metadata_get_epoch >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main proj_coordoperation_create_inverse proj_coordoperation_get_accuracy proj_coordoperation_get_grid_used @@ -2583,6 +2627,7 @@ proj_create_conversion_tunisia_mapping_grid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD proj_create_conversion_tunisia_mining_grid ======= <<<<<<< HEAD @@ -2687,6 +2732,8 @@ proj_create_conversion_tunisia_mining_grid >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main proj_create_conversion_two_point_equidistant proj_create_conversion_utm proj_create_conversion_van_der_grinten diff --git a/scripts/typos_whitelist.txt b/scripts/typos_whitelist.txt index be858bd0226e..64af41217e02 100644 --- a/scripts/typos_whitelist.txt +++ b/scripts/typos_whitelist.txt @@ -32,6 +32,7 @@ of a Deformation Model >>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main diff --git a/src/4D_api.cpp b/src/4D_api.cpp index f16ad54a96fd..a4b168017b01 100644 --- a/src/4D_api.cpp +++ b/src/4D_api.cpp @@ -281,6 +281,7 @@ int pj_get_suggested_operation(PJ_CONTEXT*, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -443,6 +444,8 @@ static void warnAboutMissingGrid(PJ* P) >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PJ_COORD proj_trans (PJ *P, PJ_DIRECTION direction, PJ_COORD coord) { /*************************************************************************************** Apply the transformation P to the coordinate coord, preferring the 4D interfaces if @@ -478,6 +481,7 @@ similarly, but prefers the 2D resp. 3D interfaces if available. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -600,6 +604,9 @@ similarly, but prefers the 2D resp. 3D interfaces if available. ======= // lon=-111.5 lat=45.26 falls into the bounding box of the Canadian >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // lon=-111.5 lat=45.26 falls into the bounding box of the Canadian +>>>>>>> locationtech-main // ntv2_0.gsb grid, except that it is not in any of the subgrids, being // in the US. We thus need another retry that will select the conus // grid. @@ -642,6 +649,7 @@ similarly, but prefers the 2D resp. 3D interfaces if available. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -756,6 +764,8 @@ similarly, but prefers the 2D resp. 3D interfaces if available. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if( direction == PJ_FWD ) pj_fwd4d( res, alt.pj ); else @@ -773,6 +783,7 @@ similarly, but prefers the 2D resp. 3D interfaces if available. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -905,6 +916,8 @@ similarly, but prefers the 2D resp. 3D interfaces if available. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if( iRetry == N_MAX_RETRY ) { break; } @@ -961,6 +974,7 @@ similarly, but prefers the 2D resp. 3D interfaces if available. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1075,6 +1089,8 @@ similarly, but prefers the 2D resp. 3D interfaces if available. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (direction == PJ_FWD) pj_fwd4d (coord, P); else @@ -1092,6 +1108,7 @@ PJ* proj_trans_get_last_used_operation(PJ* P) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1214,6 +1231,9 @@ PJ* proj_trans_get_last_used_operation(PJ* P) ======= Return the operation used during the last invokation of proj_trans(). >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + Return the operation used during the last invokation of proj_trans(). +>>>>>>> locationtech-main This is especially useful when P has been created with proj_create_crs_to_crs() and has several alternative operations. The returned object must be freed with proj_destroy(). @@ -1692,6 +1712,7 @@ indicator, as in {"+proj=utm", "+zone=32"}, or leave it out, as in {"proj=utm", <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1817,6 +1838,10 @@ indicator, as in {"+proj=utm", "+zone=32"}, or leave it out, as in {"proj=utm", PJ *P; const char *c; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + PJ *P; + const char *c; +>>>>>>> locationtech-main if (nullptr==ctx) ctx = pj_get_default_ctx (); @@ -1833,6 +1858,7 @@ indicator, as in {"+proj=utm", "+zone=32"}, or leave it out, as in {"proj=utm", <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1955,6 +1981,9 @@ indicator, as in {"+proj=utm", "+zone=32"}, or leave it out, as in {"proj=utm", ======= c = pj_make_args (argc, argv); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c = pj_make_args (argc, argv); +>>>>>>> locationtech-main if (nullptr==c) { proj_context_errno_set(ctx, PROJ_ERR_INVALID_OP /* ENOMEM */); return nullptr; @@ -1967,6 +1996,7 @@ indicator, as in {"+proj=utm", "+zone=32"}, or leave it out, as in {"proj=utm", <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2089,6 +2119,9 @@ indicator, as in {"+proj=utm", "+zone=32"}, or leave it out, as in {"proj=utm", ======= P = proj_create (ctx, c); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + P = proj_create (ctx, c); +>>>>>>> locationtech-main free ((char *) c); return P; @@ -2850,6 +2883,7 @@ static PJ* add_coord_op_to_list( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3045,6 +3079,11 @@ static PJ* create_operation_to_geog_crs(PJ_CONTEXT* ctx, const PJ* crs) { static PJ* create_operation_to_geog_crs(PJ_CONTEXT* ctx, const PJ* crs) { /*****************************************************************************/ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/*****************************************************************************/ +static PJ* create_operation_to_geog_crs(PJ_CONTEXT* ctx, const PJ* crs) { +/*****************************************************************************/ +>>>>>>> locationtech-main // Create a geographic 2D long-lat degrees CRS that is related to the // CRS auto geodetic_crs = proj_crs_get_geodetic_crs(ctx, crs); @@ -3291,6 +3330,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD pj_load_ini(ctx); // to set ctx->errorIfBestTransformationNotAvailableDefault ======= @@ -3396,6 +3436,8 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const char* authority = nullptr; double accuracy = -1; @@ -3408,6 +3450,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3522,6 +3565,8 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main for (auto iter = options; iter && iter[0]; ++iter) { const char *value; if ((value = getOptionValue(*iter, "AUTHORITY="))) { @@ -3545,6 +3590,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3682,6 +3728,8 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } else if ((value = getOptionValue(*iter, "FORCE_OVER="))) { if (ci_equal(value, "yes")) { @@ -3737,6 +3785,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3879,6 +3928,9 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons ======= proj_context_is_network_enabled(ctx) ? >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + proj_context_is_network_enabled(ctx) ? +>>>>>>> locationtech-main PROJ_GRID_AVAILABILITY_KNOWN_AVAILABLE: PROJ_GRID_AVAILABILITY_DISCARD_OPERATION_IF_MISSING_GRID); @@ -3906,6 +3958,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4120,6 +4173,11 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons assert(P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + PJ* P = proj_list_get(ctx, op_list, 0); + assert(P); + +>>>>>>> locationtech-main if( P == nullptr || op_count == 1 || proj_get_type(source_crs) == PJ_TYPE_GEOCENTRIC_CRS || proj_get_type(target_crs) == PJ_TYPE_GEOCENTRIC_CRS ) { @@ -4132,6 +4190,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4335,6 +4394,8 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return P; } @@ -4342,6 +4403,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons op_list); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -4364,6 +4426,8 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main ctx->forceOver = false; proj_list_destroy(op_list); @@ -4381,6 +4445,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4513,6 +4578,8 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main // If there's finally juste a single result, return it directly if( preparedOpList.size() == 1 ) { @@ -4531,6 +4598,7 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD P->over = forceOver; ======= @@ -4636,6 +4704,8 @@ PJ *proj_create_crs_to_crs_from_pj (PJ_CONTEXT *ctx, const PJ *source_crs, cons >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main P->iso_obj = nullptr; P->fwd = nullptr; P->inv = nullptr; @@ -4856,6 +4926,7 @@ PJ_INFO proj_info (void) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4995,6 +5066,9 @@ PJ_INFO proj_info (void) { ======= free(const_cast(info.searchpath)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + free(const_cast(info.searchpath)); +>>>>>>> locationtech-main info.searchpath = buf ? buf : empty; info.paths = ctx->c_compat_paths; @@ -5046,6 +5120,7 @@ PJ_PROJ_INFO proj_pj_info(PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5120,6 +5195,8 @@ PJ_PROJ_INFO proj_pj_info(PJ *P) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if( P->iso_obj ) { pjinfo.description = P->iso_obj->nameStr().c_str(); } else { @@ -5130,6 +5207,7 @@ PJ_PROJ_INFO proj_pj_info(PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -5247,6 +5325,8 @@ PJ_PROJ_INFO proj_pj_info(PJ *P) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // accuracy diff --git a/src/adjlon.cpp b/src/adjlon.cpp index 55ac17777c1e..70a54c044c85 100644 --- a/src/adjlon.cpp +++ b/src/adjlon.cpp @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -110,6 +111,8 @@ double adjlon (double longitude) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double adjlon (double lon) { /* Let lon slightly overshoot, to avoid spurious sign switching at the date line */ if (fabs (lon) < M_PI + 1e-12) @@ -118,6 +121,7 @@ double adjlon (double lon) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -257,6 +261,8 @@ double adjlon (double lon) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /* adjust to 0..2pi range */ lon += M_PI; @@ -270,6 +276,7 @@ double adjlon (double lon) { return lon; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -292,4 +299,6 @@ double adjlon (double lon) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } diff --git a/src/apps/cct.cpp b/src/apps/cct.cpp index 5b3c63dc9b66..3027d2bd0fa5 100644 --- a/src/apps/cct.cpp +++ b/src/apps/cct.cpp @@ -86,6 +86,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-25/2017-10-26 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -356,6 +357,9 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-25/2017-10-26 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#include +>>>>>>> locationtech-main #include // std::ifstream #include @@ -522,6 +526,7 @@ int main(int argc, char **argv) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -808,6 +813,9 @@ int main(int argc, char **argv) { ======= verbose = MIN(opt_given (o, "v"), 3); /* log level can't be larger than 3 */ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + verbose = std::min(opt_given (o, "v"), 3); /* log level can't be larger than 3 */ +>>>>>>> locationtech-main if( verbose > 0 ) { proj_log_level (PJ_DEFAULT_CTX, static_cast(verbose)); } diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp index 110b254564c6..02b5072f012b 100644 --- a/src/apps/cs2cs.cpp +++ b/src/apps/cs2cs.cpp @@ -85,6 +85,7 @@ static const char *usage = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -224,6 +225,9 @@ static const char *usage = ======= " [--authority {name}] [--accuracy {accuracy}] [--no-ballpark] [--3d]\n" >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + " [--authority {name}] [--accuracy {accuracy}] [--no-ballpark] [--3d]\n" +>>>>>>> locationtech-main " [+opt[=arg] ...] [+to +opt[=arg] ...] [file ...]\n"; static double (*informat)(const char *, @@ -570,6 +574,7 @@ int main(int argc, char **argv) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -684,6 +689,8 @@ int main(int argc, char **argv) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main bool promoteTo3D = false; /* process run line arguments */ @@ -757,6 +764,7 @@ int main(int argc, char **argv) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -892,6 +900,8 @@ int main(int argc, char **argv) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main else if (strcmp(*argv, "--3d") == 0 ) { promoteTo3D = true; } @@ -1308,6 +1318,7 @@ int main(int argc, char **argv) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1442,6 +1453,8 @@ int main(int argc, char **argv) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main options.push_back(nullptr); transformation = proj_create_crs_to_crs_from_pj(nullptr, src, dst, pj_area, options.data()); diff --git a/src/apps/gie.cpp b/src/apps/gie.cpp index d8bd47702346..dc8a3ff57eaf 100644 --- a/src/apps/gie.cpp +++ b/src/apps/gie.cpp @@ -470,6 +470,7 @@ Return the properly scaled numeric <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -721,6 +722,8 @@ Return the properly scaled numeric >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double s; const double GRS80_DEG = 111319.4908; /* deg-to-m at equator of GRS80 */ const char *endp = args; @@ -749,6 +752,7 @@ Return the properly scaled numeric else if (0==strcmp(endp, "deg")) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -771,6 +775,8 @@ Return the properly scaled numeric >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main s = GRS80_DEG * s; else s *= default_scale; @@ -861,6 +867,7 @@ static void finish_previous_operation (const char *args) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -983,6 +990,9 @@ static int operation (char *args) { ======= static int operation (char *args) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static int operation (char *args) { +>>>>>>> locationtech-main /***************************************************************************** Define the operation to apply to the input data (in ISO 19100 lingo, an operation is the general term describing something that can be @@ -1126,6 +1136,7 @@ Attempt to interpret args as a PJ_COORD. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1271,6 +1282,10 @@ Attempt to interpret args as a PJ_COORD. const char *endp; const char *dmsendp; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const char *endp; + const char *dmsendp; +>>>>>>> locationtech-main const char *prev = args; PJ_COORD a = proj_coord (0,0,0,0); @@ -1296,6 +1311,7 @@ Attempt to interpret args as a PJ_COORD. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1368,6 +1384,8 @@ Attempt to interpret args as a PJ_COORD. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double d = proj_strtod(prev, (char **) &endp); if( *endp != '\0' && !isspace(*endp) ) { @@ -1378,6 +1396,7 @@ Attempt to interpret args as a PJ_COORD. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1485,6 +1504,8 @@ Attempt to interpret args as a PJ_COORD. >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /* TODO: When projects.h is removed, call proj_dmstor() in all cases */ if (d != dms && fabs(d) < fabs(dms) && fabs(dms) < fabs(d) + 1) { d = dms; @@ -1843,6 +1864,7 @@ static int dispatch (const char *cmnd, const char *args) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1965,6 +1987,9 @@ static int dispatch (const char *cmnd, const char *args) { ======= if (0==strcmp (cmnd, "operation")) return operation ((char *) args); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (0==strcmp (cmnd, "operation")) return operation ((char *) args); +>>>>>>> locationtech-main if (0==strcmp (cmnd, "crs_src")) return crs_src (args); if (0==strcmp (cmnd, "crs_dst")) return crs_dst (args); if (T.skip_test) diff --git a/src/apps/proj_strtod.cpp b/src/apps/proj_strtod.cpp index 9834d3ebdebc..5f9360c227e1 100644 --- a/src/apps/proj_strtod.cpp +++ b/src/apps/proj_strtod.cpp @@ -107,6 +107,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -229,6 +230,9 @@ double proj_strtod(const char *str, char **endptr) { ======= char *p = (char *) str; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + char *p = (char *) str; +>>>>>>> locationtech-main int n = 0; int num_digits_total = 0; int num_digits_after_comma = 0; @@ -244,6 +248,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -366,6 +371,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = p; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = p; +>>>>>>> locationtech-main return HUGE_VAL; } @@ -383,6 +391,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -505,6 +514,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = (char *) str; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = (char *) str; +>>>>>>> locationtech-main return 0; } @@ -518,6 +530,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -640,6 +653,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = (char *) str; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = (char *) str; +>>>>>>> locationtech-main return 0; } @@ -664,6 +680,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -786,6 +803,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = (char *) str; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = (char *) str; +>>>>>>> locationtech-main return 0; } @@ -799,6 +819,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -921,6 +942,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = (char *) str; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = (char *) str; +>>>>>>> locationtech-main return 0; } @@ -938,6 +962,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1060,6 +1085,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = p; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = p; +>>>>>>> locationtech-main return sign==-1? -0: 0; } @@ -1085,6 +1113,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1207,6 +1236,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = p; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = p; +>>>>>>> locationtech-main if (sign==-1) return -number; return number; @@ -1235,6 +1267,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1357,6 +1390,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = p; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = p; +>>>>>>> locationtech-main if (sign==-1) return -number; return number; @@ -1396,6 +1432,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1518,6 +1555,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = p; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = p; +>>>>>>> locationtech-main return HUGE_VAL; } @@ -1552,6 +1592,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1674,6 +1715,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = p; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = p; +>>>>>>> locationtech-main return HUGE_VAL; } } @@ -1706,6 +1750,7 @@ double proj_strtod(const char *str, char **endptr) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1828,6 +1873,9 @@ double proj_strtod(const char *str, char **endptr) { ======= *endptr = p; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + *endptr = p; +>>>>>>> locationtech-main if ((exponent < DBL_MIN_EXP) || (exponent > DBL_MAX_EXP)) { errno = ERANGE; diff --git a/src/apps/projinfo.cpp b/src/apps/projinfo.cpp index 36004291e830..e20adffd6184 100644 --- a/src/apps/projinfo.cpp +++ b/src/apps/projinfo.cpp @@ -48,6 +48,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #include ======= <<<<<<< HEAD @@ -152,6 +153,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #include #include #include @@ -167,6 +170,7 @@ using namespace NS_PROJ::common; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD using namespace NS_PROJ::coordinates; ======= <<<<<<< HEAD @@ -271,6 +275,8 @@ using namespace NS_PROJ::coordinates; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main using namespace NS_PROJ::crs; using namespace NS_PROJ::io; using namespace NS_PROJ::metadata; @@ -1064,6 +1070,7 @@ static void outputOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1250,6 +1257,11 @@ static void outputOperations( std::cerr << "source CRS string is not a CRS" << std::endl; std::exit(1); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (!sourceCRS) { + std::cerr << "source CRS string is not a CRS" << std::endl; + std::exit(1); +>>>>>>> locationtech-main } auto targetObj = @@ -1264,6 +1276,7 @@ static void outputOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1458,6 +1471,8 @@ static void outputOperations( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!targetCRS) { std::cerr << "target CRS string is not a CRS" << std::endl; std::exit(1); @@ -1467,6 +1482,7 @@ static void outputOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -1509,6 +1525,8 @@ static void outputOperations( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main // Auto-promote source/target CRS if it is specified by its name, // if it has a known 3D version of it and that the other CRS is 3D. // e.g projinfo -s "WGS 84 + EGM96 height" -t "WGS 84" @@ -1540,6 +1558,7 @@ static void outputOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1665,6 +1684,10 @@ static void outputOperations( auto nnSourceCRS = NN_NO_CHECK(sourceCRS); auto nnTargetCRS = NN_NO_CHECK(targetCRS); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto nnSourceCRS = NN_NO_CHECK(sourceCRS); + auto nnTargetCRS = NN_NO_CHECK(targetCRS); +>>>>>>> locationtech-main std::vector list; size_t spatialCriterionPartialIntersectionResultCount = 0; bool spatialCriterionPartialIntersectionMoreRelevant = false; @@ -1683,6 +1706,7 @@ static void outputOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1825,6 +1849,8 @@ static void outputOperations( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main ctxt->setSpatialCriterion(spatialCriterion); ctxt->setSourceAndTargetCRSExtentUse(crsExtentUse); ctxt->setGridAvailabilityUse(gridAvailabilityUse); @@ -1843,6 +1869,7 @@ static void outputOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1983,6 +2010,10 @@ static void outputOperations( list = CoordinateOperationFactory::create()->createOperations( nnSourceCRS, nnTargetCRS, ctxt); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + list = CoordinateOperationFactory::create()->createOperations( + nnSourceCRS, nnTargetCRS, ctxt); +>>>>>>> locationtech-main if (!spatialCriterionExplicitlySpecified && spatialCriterion == CoordinateOperationContext::SpatialCriterion:: STRICT_CONTAINMENT) { @@ -1997,6 +2028,7 @@ static void outputOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2143,6 +2175,11 @@ static void outputOperations( CoordinateOperationFactory::create()->createOperations( nnSourceCRS, nnTargetCRS, ctxt); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto list2 = + CoordinateOperationFactory::create()->createOperations( + nnSourceCRS, nnTargetCRS, ctxt); +>>>>>>> locationtech-main spatialCriterionPartialIntersectionResultCount = list2.size(); if (spatialCriterionPartialIntersectionResultCount == 1 && list.size() == 1 && diff --git a/src/apps/projsync.cpp b/src/apps/projsync.cpp index 630d153fc77f..cd023b0ed95f 100644 --- a/src/apps/projsync.cpp +++ b/src/apps/projsync.cpp @@ -296,6 +296,7 @@ int main(int argc, char *argv[]) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -418,6 +419,9 @@ int main(int argc, char *argv[]) { ======= std::cout << "filename,source_id,area_of_use,file_size" << std::endl; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + std::cout << "filename,source_id,area_of_use,file_size" << std::endl; +>>>>>>> locationtech-main } std::string proj_data_version_str; @@ -497,6 +501,7 @@ int main(int argc, char *argv[]) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -619,6 +624,9 @@ int main(int argc, char *argv[]) { ======= << " and we are targetting " >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + << " and we are targetting " +>>>>>>> locationtech-main << proj_data_version_str << std::endl; } continue; @@ -653,6 +661,7 @@ int main(int argc, char *argv[]) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -775,6 +784,9 @@ int main(int argc, char *argv[]) { ======= << " and we are targetting " >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + << " and we are targetting " +>>>>>>> locationtech-main << proj_data_version_str << std::endl; } continue; diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp index 0882880fe64b..b187bcd2266e 100644 --- a/src/conversions/unitconvert.cpp +++ b/src/conversions/unitconvert.cpp @@ -331,6 +331,7 @@ static PJ_XYZ forward_3d(PJ_LPZ lpz, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -443,6 +444,8 @@ static PJ_XYZ forward_3d(PJ_LPZ lpz, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning @@ -453,6 +456,7 @@ static PJ_XYZ forward_3d(PJ_LPZ lpz, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -681,6 +685,8 @@ static PJ_XYZ forward_3d(PJ_LPZ lpz, PJ *P) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const auto xy = forward_2d(point.lp, P); point.xy = xy; @@ -707,6 +713,7 @@ static PJ_LPZ reverse_3d(PJ_XYZ xyz, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -819,6 +826,8 @@ static PJ_LPZ reverse_3d(PJ_XYZ xyz, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning @@ -829,6 +838,7 @@ static PJ_LPZ reverse_3d(PJ_XYZ xyz, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1057,6 +1067,8 @@ static PJ_LPZ reverse_3d(PJ_XYZ xyz, PJ *P) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const auto lp = reverse_2d(point.xy, P); point.lp = lp; @@ -1082,6 +1094,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1194,6 +1207,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning @@ -1206,6 +1221,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1452,6 +1468,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { ======= coo.xyz = forward_3d(coo.lpz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (Q->t_in_id >= 0) coo.xyzt.t = time_units[Q->t_in_id].t_in( coo.xyzt.t ); @@ -1476,6 +1494,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1588,6 +1607,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning @@ -1600,6 +1621,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1846,6 +1868,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { ======= coo.lpz = reverse_3d(coo.xyz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (Q->t_out_id >= 0) coo.xyzt.t = time_units[Q->t_out_id].t_in( coo.xyzt.t ); diff --git a/src/ctx.cpp b/src/ctx.cpp index 8f8bd9abe64f..8a4055e2d1a7 100644 --- a/src/ctx.cpp +++ b/src/ctx.cpp @@ -157,6 +157,7 @@ pj_ctx::pj_ctx(const pj_ctx& other) : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -271,6 +272,8 @@ pj_ctx::pj_ctx(const pj_ctx& other) : >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main logger(other.logger), logger_app_data(other.logger_app_data), cpp_context(other.cpp_context ? other.cpp_context->clone(this) : nullptr), diff --git a/src/datum_set.cpp b/src/datum_set.cpp index d90681c000c7..fc4b7bf01ad0 100644 --- a/src/datum_set.cpp +++ b/src/datum_set.cpp @@ -73,6 +73,7 @@ int pj_datum_set(PJ_CONTEXT *ctx, paralist *pl, PJ *projdef) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD const struct PJ_DATUMS * pj_datums = pj_get_datums_ref(); ======= @@ -178,6 +179,8 @@ int pj_datum_set(PJ_CONTEXT *ctx, paralist *pl, PJ *projdef) >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main for (i = 0; (s = pj_datums[i].id) && strcmp(name, s) ; ++i) {} if (!s) { diff --git a/src/datums.cpp b/src/datums.cpp index 3b035d221af6..5f608a46b0b5 100644 --- a/src/datums.cpp +++ b/src/datums.cpp @@ -45,6 +45,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -167,6 +168,9 @@ C_NAMESPACE_VAR const struct PJ_DATUMS pj_datums[] = { ======= C_NAMESPACE_VAR const struct PJ_DATUMS pj_datums[] = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +C_NAMESPACE_VAR const struct PJ_DATUMS pj_datums[] = { +>>>>>>> locationtech-main /* id definition ellipse comments */ /* -- ---------- ------- -------- */ {"WGS84", "towgs84=0,0,0", "WGS84", ""}, @@ -203,6 +207,7 @@ C_NAMESPACE_VAR const struct PJ_DATUMS pj_datums[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -357,6 +362,11 @@ struct PJ_DATUMS *pj_get_datums_ref() { return (struct PJ_DATUMS *)pj_datums; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +struct PJ_DATUMS *pj_get_datums_ref() +{ + return (struct PJ_DATUMS *)pj_datums; +>>>>>>> locationtech-main } static const struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { diff --git a/src/ell_set.cpp b/src/ell_set.cpp index f932b927fd74..66e25bfe3e7d 100644 --- a/src/ell_set.cpp +++ b/src/ell_set.cpp @@ -592,6 +592,7 @@ int pj_calc_ellipsoid_params (PJ *P, double a, double es) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -878,6 +879,9 @@ int pj_calc_ellipsoid_params (PJ *P, double a, double es) { ======= if (P->f == 1.0) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (!(P->f >= 0.0 && P->f < 1.0)) { +>>>>>>> locationtech-main proj_log_error(P, _("Invalid eccentricity")); proj_errno_set (P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE); return PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE; diff --git a/src/filemanager.cpp b/src/filemanager.cpp index 357c6b324a23..024a6296a6d3 100644 --- a/src/filemanager.cpp +++ b/src/filemanager.cpp @@ -1826,6 +1826,7 @@ void pj_load_ini(PJ_CONTEXT *ctx) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1963,6 +1964,8 @@ void pj_load_ini(PJ_CONTEXT *ctx) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main ctx->iniFileLoaded = true; auto file = std::unique_ptr( reinterpret_cast(pj_open_lib_internal( @@ -2029,6 +2032,7 @@ void pj_load_ini(PJ_CONTEXT *ctx) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2161,6 +2165,8 @@ void pj_load_ini(PJ_CONTEXT *ctx) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } } diff --git a/src/geodesic.c b/src/geodesic.c index c0facc7249c3..f45925eb9984 100644 --- a/src/geodesic.c +++ b/src/geodesic.c @@ -85,6 +85,7 @@ static void Init(void) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -371,6 +372,9 @@ static void Init(void) { ======= tolb = tol0 * tol2; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + tolb = tol0; +>>>>>>> locationtech-main xthresh = 1000 * tol2; degree = pi/hd; NaN = nan("0"); @@ -412,6 +416,7 @@ static double sumx(double u, double v, double* t) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -698,6 +703,9 @@ static double polyvalx(int N, const double p[], double x) { ======= static double polyval(int N, const double p[], double x) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static double polyvalx(int N, const double p[], double x) { +>>>>>>> locationtech-main double y = N < 0 ? 0 : *p++; while (--N >= 0) y = y * x + *p++; return y; @@ -1473,6 +1481,7 @@ static double geod_geninverse_int(const struct geod_geodesic* g, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1759,6 +1768,9 @@ static double geod_geninverse_int(const struct geod_geodesic* g, ======= for (; numit < maxit2; ++numit) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + for (;; ++numit) { +>>>>>>> locationtech-main /* the WGS84 test set: mean = 1.47, sd = 1.25, max = 16 * WGS84 and random input: mean = 2.85, sd = 0.60 */ double dv = 0, @@ -1774,6 +1786,7 @@ static double geod_geninverse_int(const struct geod_geodesic* g, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1886,6 +1899,8 @@ static double geod_geninverse_int(const struct geod_geodesic* g, ======= >>>>>>> bd2f3a692f (install.rst: improve instructions regarding proj-data (fixes #3539)) >>>>>>> b5faafdd4a (install.rst: improve instructions regarding proj-data (fixes #3539)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main if (tripb || /* Reversed test to allow escape with NaNs */ @@ -1898,6 +1913,7 @@ static double geod_geninverse_int(const struct geod_geodesic* g, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2154,6 +2170,8 @@ static double geod_geninverse_int(const struct geod_geodesic* g, /* Reversed test to allow escape with NaNs */ if (tripb || !(fabs(v) >= (tripn ? 8 : 1) * tol0)) break; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /* Update bracketing values */ if (v > 0 && (numit > maxit1 || calp1/salp1 > calp1b/salp1b)) { salp1b = salp1; calp1b = calp1; } @@ -2170,6 +2188,7 @@ static double geod_geninverse_int(const struct geod_geodesic* g, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2282,6 +2301,8 @@ static double geod_geninverse_int(const struct geod_geodesic* g, ======= >>>>>>> bd2f3a692f (install.rst: improve instructions regarding proj-data (fixes #3539)) >>>>>>> b5faafdd4a (install.rst: improve instructions regarding proj-data (fixes #3539)) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main if (fabs(dalp1) < pi) { double @@ -2302,6 +2323,7 @@ static double geod_geninverse_int(const struct geod_geodesic* g, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) @@ -2617,6 +2639,8 @@ static double geod_geninverse_int(const struct geod_geodesic* g, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } } /* Either dv was not positive or updated value was outside legal @@ -3196,6 +3220,7 @@ double A3f(const struct geod_geodesic* g, double eps) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3482,6 +3507,9 @@ double A3f(const struct geod_geodesic* g, double eps) { ======= return polyval(nA3 - 1, g->A3x, eps); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return polyvalx(nA3 - 1, g->A3x, eps); +>>>>>>> locationtech-main } void C3f(const struct geod_geodesic* g, double eps, double c[]) { @@ -3500,6 +3528,7 @@ void C3f(const struct geod_geodesic* g, double eps, double c[]) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3786,6 +3815,9 @@ void C3f(const struct geod_geodesic* g, double eps, double c[]) { ======= c[l] = mult * polyval(m, g->C3x + o, eps); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c[l] = mult * polyvalx(m, g->C3x + o, eps); +>>>>>>> locationtech-main o += m + 1; } } @@ -3805,6 +3837,7 @@ void C4f(const struct geod_geodesic* g, double eps, double c[]) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4091,6 +4124,9 @@ void C4f(const struct geod_geodesic* g, double eps, double c[]) { ======= c[l] = mult * polyval(m, g->C4x + o, eps); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c[l] = mult * polyvalx(m, g->C4x + o, eps); +>>>>>>> locationtech-main o += m + 1; mult *= eps; } @@ -4111,6 +4147,7 @@ double A1m1f(double eps) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4397,6 +4434,9 @@ double A1m1f(double eps) { ======= double t = polyval(m, coeff, sq(eps)) / coeff[m + 1]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double t = polyvalx(m, coeff, sq(eps)) / coeff[m + 1]; +>>>>>>> locationtech-main return (t + eps) / (1 - eps); } @@ -4430,6 +4470,7 @@ void C1f(double eps, double c[]) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4716,6 +4757,9 @@ void C1f(double eps, double c[]) { ======= c[l] = d * polyval(m, coeff + o, eps2) / coeff[o + m + 1]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c[l] = d * polyvalx(m, coeff + o, eps2) / coeff[o + m + 1]; +>>>>>>> locationtech-main o += m + 2; d *= eps; } @@ -4751,6 +4795,7 @@ void C1pf(double eps, double c[]) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5037,6 +5082,9 @@ void C1pf(double eps, double c[]) { ======= c[l] = d * polyval(m, coeff + o, eps2) / coeff[o + m + 1]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c[l] = d * polyvalx(m, coeff + o, eps2) / coeff[o + m + 1]; +>>>>>>> locationtech-main o += m + 2; d *= eps; } @@ -5057,6 +5105,7 @@ double A2m1f(double eps) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5343,6 +5392,9 @@ double A2m1f(double eps) { ======= double t = polyval(m, coeff, sq(eps)) / coeff[m + 1]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double t = polyvalx(m, coeff, sq(eps)) / coeff[m + 1]; +>>>>>>> locationtech-main return (t - eps) / (1 + eps); } @@ -5376,6 +5428,7 @@ void C2f(double eps, double c[]) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5662,6 +5715,9 @@ void C2f(double eps, double c[]) { ======= c[l] = d * polyval(m, coeff + o, eps2) / coeff[o + m + 1]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c[l] = d * polyvalx(m, coeff + o, eps2) / coeff[o + m + 1]; +>>>>>>> locationtech-main o += m + 2; d *= eps; } @@ -5694,6 +5750,7 @@ void A3coeff(struct geod_geodesic* g) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5980,6 +6037,9 @@ void A3coeff(struct geod_geodesic* g) { ======= g->A3x[k++] = polyval(m, coeff + o, g->n) / coeff[o + m + 1]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + g->A3x[k++] = polyvalx(m, coeff + o, g->n) / coeff[o + m + 1]; +>>>>>>> locationtech-main o += m + 2; } } @@ -6030,6 +6090,7 @@ void C3coeff(struct geod_geodesic* g) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6316,6 +6377,9 @@ void C3coeff(struct geod_geodesic* g) { ======= g->C3x[k++] = polyval(m, coeff + o, g->n) / coeff[o + m + 1]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + g->C3x[k++] = polyvalx(m, coeff + o, g->n) / coeff[o + m + 1]; +>>>>>>> locationtech-main o += m + 2; } } @@ -6379,6 +6443,7 @@ void C4coeff(struct geod_geodesic* g) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6665,6 +6730,9 @@ void C4coeff(struct geod_geodesic* g) { ======= g->C4x[k++] = polyval(m, coeff + o, g->n) / coeff[o + m + 1]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + g->C4x[k++] = polyvalx(m, coeff + o, g->n) / coeff[o + m + 1]; +>>>>>>> locationtech-main o += m + 2; } } diff --git a/src/geodesic.h b/src/geodesic.h index e81b1da87515..6bc16d52c99a 100644 --- a/src/geodesic.h +++ b/src/geodesic.h @@ -39,6 +39,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -325,6 +326,9 @@ ======= #define GEODESIC_VERSION_MINOR 0 >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#define GEODESIC_VERSION_MINOR 1 +>>>>>>> locationtech-main /** * The patch level of the geodesic library. (This tracks the version of * GeographicLib.) diff --git a/src/grids.cpp b/src/grids.cpp index d72906ef9aaf..eefe380c8b1a 100644 --- a/src/grids.cpp +++ b/src/grids.cpp @@ -1695,6 +1695,7 @@ static bool isPointInExtent(double x, double y, const ExtentAndRes &extent, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1769,6 +1770,8 @@ const VerticalShiftGrid *VerticalShiftGrid::gridAt(double longitude, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const VerticalShiftGrid *VerticalShiftGrid::gridAt(double lon, double lat) const { for (const auto &child : m_children) { @@ -1781,6 +1784,7 @@ const VerticalShiftGrid *VerticalShiftGrid::gridAt(double lon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1892,6 +1896,8 @@ const VerticalShiftGrid *VerticalShiftGrid::gridAt(double longitude, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } } return this; @@ -1905,6 +1911,7 @@ const VerticalShiftGrid *VerticalShiftGrid::gridAt(double longitude, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2027,6 +2034,9 @@ const VerticalShiftGrid *VerticalShiftGridSet::gridAt(double lon, ======= const VerticalShiftGrid *VerticalShiftGridSet::gridAt(double lon, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +const VerticalShiftGrid *VerticalShiftGridSet::gridAt(double lon, +>>>>>>> locationtech-main double lat) const { for (const auto &grid : m_grids) { if (grid->isNullGrid()) { @@ -2040,6 +2050,7 @@ const VerticalShiftGrid *VerticalShiftGridSet::gridAt(double lon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2185,6 +2196,10 @@ const VerticalShiftGrid *VerticalShiftGridSet::gridAt(double lon, if (isPointInExtent(lon, lat, extent)) { return grid->gridAt(lon, lat); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (isPointInExtent(lon, lat, extent)) { + return grid->gridAt(lon, lat); +>>>>>>> locationtech-main } } return nullptr; @@ -2234,6 +2249,7 @@ class NullHorizontalShiftGrid : public HorizontalShiftGrid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2356,6 +2372,9 @@ class NullHorizontalShiftGrid : public HorizontalShiftGrid { ======= bool valueAt(int, int, bool, float &lonShift, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool valueAt(int, int, bool, float &lonShift, +>>>>>>> locationtech-main float &latShift) const override; void reassign_context(PJ_CONTEXT *) override {} @@ -2376,6 +2395,7 @@ class NullHorizontalShiftGrid : public HorizontalShiftGrid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2530,6 +2550,11 @@ bool NullHorizontalShiftGrid::valueAt(int, int, bool, float &lonShift, float &latShift) const { lonShift = 0.0f; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +bool NullHorizontalShiftGrid::valueAt(int, int, bool, float &lonShift, + float &latShift) const { + lonShift = 0.0f; +>>>>>>> locationtech-main latShift = 0.0f; return true; } @@ -2567,6 +2592,7 @@ class NTv1Grid : public HorizontalShiftGrid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2689,6 +2715,9 @@ class NTv1Grid : public HorizontalShiftGrid { ======= bool valueAt(int, int, bool, float &lonShift, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool valueAt(int, int, bool, float &lonShift, +>>>>>>> locationtech-main float &latShift) const override; static NTv1Grid *open(PJ_CONTEXT *ctx, std::unique_ptr fp, @@ -2785,6 +2814,7 @@ bool NTv1Grid::valueAt(int x, int y, bool compensateNTConvention, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2907,6 +2937,9 @@ bool NTv1Grid::valueAt(int x, int y, bool compensateNTConvention, ======= float &lonShift, float &latShift) const { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + float &lonShift, float &latShift) const { +>>>>>>> locationtech-main assert(x >= 0 && y >= 0 && x < m_width && y < m_height); double two_doubles[2]; @@ -2931,6 +2964,7 @@ bool NTv1Grid::valueAt(int x, int y, bool compensateNTConvention, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3076,6 +3110,10 @@ bool NTv1Grid::valueAt(int x, int y, bool compensateNTConvention, lonShift = (compensateNTConvention ? -1 : 1) * static_cast(two_doubles[1] * ((M_PI / 180.0) / 3600.0)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + lonShift = (compensateNTConvention ? -1 : 1) * + static_cast(two_doubles[1] * ((M_PI / 180.0) / 3600.0)); +>>>>>>> locationtech-main return true; } @@ -3105,6 +3143,7 @@ class CTable2Grid : public HorizontalShiftGrid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3227,6 +3266,9 @@ class CTable2Grid : public HorizontalShiftGrid { ======= bool valueAt(int, int, bool, float &lonShift, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool valueAt(int, int, bool, float &lonShift, +>>>>>>> locationtech-main float &latShift) const override; static CTable2Grid *open(PJ_CONTEXT *ctx, std::unique_ptr fp, @@ -3315,6 +3357,7 @@ bool CTable2Grid::valueAt(int x, int y, bool compensateNTConvention, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3437,6 +3480,9 @@ bool CTable2Grid::valueAt(int x, int y, bool compensateNTConvention, ======= float &lonShift, float &latShift) const { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + float &lonShift, float &latShift) const { +>>>>>>> locationtech-main assert(x >= 0 && y >= 0 && x < m_width && y < m_height); float two_floats[2]; @@ -3459,6 +3505,7 @@ bool CTable2Grid::valueAt(int x, int y, bool compensateNTConvention, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3581,6 +3628,9 @@ bool CTable2Grid::valueAt(int x, int y, bool compensateNTConvention, ======= lonShift = (compensateNTConvention ? -1 : 1) * two_floats[0]; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + lonShift = (compensateNTConvention ? -1 : 1) * two_floats[0]; +>>>>>>> locationtech-main return true; } @@ -3640,6 +3690,7 @@ class NTv2Grid : public HorizontalShiftGrid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3762,6 +3813,9 @@ class NTv2Grid : public HorizontalShiftGrid { ======= bool valueAt(int, int, bool, float &lonShift, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool valueAt(int, int, bool, float &lonShift, +>>>>>>> locationtech-main float &latShift) const override; const std::string &metadataItem(const std::string &, int) const override { @@ -3788,6 +3842,7 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3910,6 +3965,9 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention, ======= float &lonShift, float &latShift) const { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + float &lonShift, float &latShift) const { +>>>>>>> locationtech-main assert(x >= 0 && y >= 0 && x < m_width && y < m_height); const std::vector *pBuffer = m_cache->get(m_gridIdx, y); @@ -3929,6 +3987,7 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4051,6 +4110,9 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention, ======= // there are 4 components: lat shift, lon shift, lat error, lon error >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // there are 4 components: lat shift, lon shift, lat error, lon error +>>>>>>> locationtech-main m_fp->seek(m_offset + nLineSizeInBytes * static_cast(y)); if (m_fp->read(&m_buffer[0], nLineSizeInBytes) != nLineSizeInBytes) { @@ -4065,6 +4127,7 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4187,6 +4250,9 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention, ======= // Remove lat and lon error >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // Remove lat and lon error +>>>>>>> locationtech-main for (int i = 1; i < m_width; ++i) { m_buffer[2 * i] = m_buffer[4 * i]; m_buffer[2 * i + 1] = m_buffer[4 * i + 1]; @@ -4220,6 +4286,7 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4342,6 +4409,9 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention, ======= lonShift = >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + lonShift = +>>>>>>> locationtech-main (compensateNTConvention ? -1 : 1) * static_cast(buffer[2 * x + 1] * ((M_PI / 180.0) / 3600.0)); return true; @@ -4576,6 +4646,7 @@ class GTiffHGrid : public HorizontalShiftGrid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4698,6 +4769,9 @@ class GTiffHGrid : public HorizontalShiftGrid { ======= uint16_t m_idxLonShift; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + uint16_t m_idxLonShift; +>>>>>>> locationtech-main double m_convFactorToRadian; bool m_positiveEast; @@ -4710,6 +4784,7 @@ class GTiffHGrid : public HorizontalShiftGrid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4832,6 +4907,9 @@ class GTiffHGrid : public HorizontalShiftGrid { ======= uint16_t idxLonShift, double convFactorToRadian, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + uint16_t idxLonShift, double convFactorToRadian, +>>>>>>> locationtech-main bool positiveEast); ~GTiffHGrid() override; @@ -4843,6 +4921,7 @@ class GTiffHGrid : public HorizontalShiftGrid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4965,6 +5044,9 @@ class GTiffHGrid : public HorizontalShiftGrid { ======= bool valueAt(int x, int y, bool, float &lonShift, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool valueAt(int x, int y, bool, float &lonShift, +>>>>>>> locationtech-main float &latShift) const override; const std::string &metadataItem(const std::string &key, @@ -4995,6 +5077,7 @@ GTiffHGrid::GTiffHGrid(std::unique_ptr &&grid, uint16_t idxLatShift, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5117,6 +5200,9 @@ GTiffHGrid::GTiffHGrid(std::unique_ptr &&grid, uint16_t idxLatShift, ======= uint16_t idxLonShift, double convFactorToRadian, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + uint16_t idxLonShift, double convFactorToRadian, +>>>>>>> locationtech-main bool positiveEast) : HorizontalShiftGrid(grid->name(), grid->width(), grid->height(), grid->extentAndRes()), @@ -5128,6 +5214,7 @@ GTiffHGrid::GTiffHGrid(std::unique_ptr &&grid, uint16_t idxLatShift, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5250,6 +5337,9 @@ GTiffHGrid::GTiffHGrid(std::unique_ptr &&grid, uint16_t idxLatShift, ======= m_idxLonShift(idxLonShift), m_convFactorToRadian(convFactorToRadian), >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + m_idxLonShift(idxLonShift), m_convFactorToRadian(convFactorToRadian), +>>>>>>> locationtech-main m_positiveEast(positiveEast) {} // --------------------------------------------------------------------------- @@ -5265,6 +5355,7 @@ GTiffHGrid::~GTiffHGrid() = default; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5337,6 +5428,8 @@ bool GTiffHGrid::valueAt(int x, int y, bool, float &longShift, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main bool GTiffHGrid::valueAt(int x, int y, bool, float &lonShift, float &latShift) const { if (!m_grid->valueAt(m_idxLatShift, x, y, latShift) || @@ -5347,6 +5440,7 @@ bool GTiffHGrid::valueAt(int x, int y, bool, float &lonShift, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -5454,6 +5548,8 @@ bool GTiffHGrid::valueAt(int x, int y, bool, float &longShift, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return false; } // From arc-seconds to radians @@ -5465,6 +5561,7 @@ bool GTiffHGrid::valueAt(int x, int y, bool, float &longShift, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5619,6 +5716,11 @@ bool GTiffHGrid::valueAt(int x, int y, bool, float &longShift, if (!m_positiveEast) { lonShift = -lonShift; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + lonShift = static_cast(lonShift * m_convFactorToRadian); + if (!m_positiveEast) { + lonShift = -lonShift; +>>>>>>> locationtech-main } return true; } @@ -5667,6 +5769,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5789,6 +5892,9 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, ======= uint16_t idxLonShift = 1; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + uint16_t idxLonShift = 1; +>>>>>>> locationtech-main constexpr double ARC_SECOND_TO_RADIAN = (M_PI / 180.0) / 3600.0; double convFactorToRadian = ARC_SECOND_TO_RADIAN; bool positiveEast = true; @@ -5839,6 +5945,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5961,6 +6068,9 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, ======= bool foundDescriptionForLonOffset = false; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool foundDescriptionForLonOffset = false; +>>>>>>> locationtech-main for (int i = 0; i < static_cast(grid->samplesPerPixel()); ++i) { const auto &desc = grid->metadataItem("DESCRIPTION", i); if (!desc.empty()) { @@ -5977,6 +6087,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6122,6 +6233,10 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, idxLonShift = static_cast(i); foundDescriptionForLonOffset = true; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + idxLonShift = static_cast(i); + foundDescriptionForLonOffset = true; +>>>>>>> locationtech-main } } @@ -6133,6 +6248,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6255,6 +6371,9 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, ======= if (!foundDescriptionForLonOffset && >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (!foundDescriptionForLonOffset && +>>>>>>> locationtech-main !foundDescriptionForLatOffset) { if (ifd > 0) { // Assuming that extra IFD without @@ -6281,6 +6400,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6403,6 +6523,9 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, ======= if (foundDescriptionForLatOffset && !foundDescriptionForLonOffset) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (foundDescriptionForLatOffset && !foundDescriptionForLonOffset) { +>>>>>>> locationtech-main pj_log( ctx, PJ_LOG_ERROR, _("Found latitude_offset channel, but not longitude_offset")); @@ -6414,6 +6537,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6536,6 +6660,9 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, ======= } else if (foundDescriptionForLonOffset && >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + } else if (foundDescriptionForLonOffset && +>>>>>>> locationtech-main !foundDescriptionForLatOffset) { pj_log( ctx, PJ_LOG_ERROR, @@ -6551,6 +6678,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6673,6 +6801,9 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, ======= idxLonShift >= grid->samplesPerPixel()) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + idxLonShift >= grid->samplesPerPixel()) { +>>>>>>> locationtech-main pj_log(ctx, PJ_LOG_ERROR, _("Invalid sample index")); return nullptr; } @@ -6684,6 +6815,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6838,6 +6970,11 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, const std::string &positiveValue = grid->metadataItem("positive_value", idxLonShift); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (foundDescriptionForLonOffset) { + const std::string &positiveValue = + grid->metadataItem("positive_value", idxLonShift); +>>>>>>> locationtech-main if (!positiveValue.empty()) { if (positiveValue == "west") { positiveEast = false; @@ -6863,6 +7000,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7017,6 +7155,11 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, grid->metadataItem("UNITTYPE", idxLonShift); if (unitLatShift != unitLonShift) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const auto &unitLonShift = + grid->metadataItem("UNITTYPE", idxLonShift); + if (unitLatShift != unitLonShift) { +>>>>>>> locationtech-main pj_log(ctx, PJ_LOG_ERROR, _("Different unit for longitude and latitude offset")); return nullptr; @@ -7048,6 +7191,7 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7170,6 +7314,9 @@ GTiffHGridShiftSet::open(PJ_CONTEXT *ctx, std::unique_ptr fp, ======= std::move(grid), idxLatShift, idxLonShift, convFactorToRadian, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + std::move(grid), idxLatShift, idxLonShift, convFactorToRadian, +>>>>>>> locationtech-main positiveEast); insertIntoHierarchy(ctx, std::move(hgrid), gridName, parentName, @@ -7290,6 +7437,7 @@ bool HorizontalShiftGridSet::reopen(PJ_CONTEXT *ctx) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7412,6 +7560,9 @@ const HorizontalShiftGrid *HorizontalShiftGrid::gridAt(double lon, ======= const HorizontalShiftGrid *HorizontalShiftGrid::gridAt(double lon, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +const HorizontalShiftGrid *HorizontalShiftGrid::gridAt(double lon, +>>>>>>> locationtech-main double lat) const { for (const auto &child : m_children) { const auto &extentChild = child->extentAndRes(); @@ -7424,6 +7575,7 @@ const HorizontalShiftGrid *HorizontalShiftGrid::gridAt(double lon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7569,6 +7721,10 @@ const HorizontalShiftGrid *HorizontalShiftGrid::gridAt(double lon, if (isPointInExtent(lon, lat, extentChild, epsilon)) { return child->gridAt(lon, lat); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (isPointInExtent(lon, lat, extentChild, epsilon)) { + return child->gridAt(lon, lat); +>>>>>>> locationtech-main } } return this; @@ -7582,6 +7738,7 @@ const HorizontalShiftGrid *HorizontalShiftGrid::gridAt(double lon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7704,6 +7861,9 @@ const HorizontalShiftGrid *HorizontalShiftGridSet::gridAt(double lon, ======= const HorizontalShiftGrid *HorizontalShiftGridSet::gridAt(double lon, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +const HorizontalShiftGrid *HorizontalShiftGridSet::gridAt(double lon, +>>>>>>> locationtech-main double lat) const { for (const auto &grid : m_grids) { if (grid->isNullGrid()) { @@ -7719,6 +7879,7 @@ const HorizontalShiftGrid *HorizontalShiftGridSet::gridAt(double lon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7864,6 +8025,10 @@ const HorizontalShiftGrid *HorizontalShiftGridSet::gridAt(double lon, if (isPointInExtent(lon, lat, extent, epsilon)) { return grid->gridAt(lon, lat); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (isPointInExtent(lon, lat, extent, epsilon)) { + return grid->gridAt(lon, lat); +>>>>>>> locationtech-main } } return nullptr; @@ -8445,6 +8610,7 @@ static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8541,6 +8707,8 @@ static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main float f00Lon = 0, f00Lat = 0; float f10Lon = 0, f10Lat = 0; float f01Lon = 0, f01Lat = 0; @@ -8550,6 +8718,7 @@ static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8677,6 +8846,8 @@ static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main f00Lat) || !grid->valueAt(indx.lam + 1, indx.phi, compensateNTConvention, f10Lon, f10Lat) || @@ -8686,6 +8857,7 @@ static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid, f11Lon, f11Lat)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -8708,6 +8880,8 @@ static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return val; } @@ -8727,6 +8901,7 @@ static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8849,6 +9024,9 @@ static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid, ======= val.lam = m00 * f00Lon + m10 * f10Lon + m01 * f01Lon + m11 * f11Lon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + val.lam = m00 * f00Lon + m10 * f10Lon + m01 * f01Lon + m11 * f11Lon; +>>>>>>> locationtech-main val.phi = m00 * f00Lat + m10 * f10Lat + m01 * f01Lat + m11 * f11Lat; return val; } diff --git a/src/grids.hpp b/src/grids.hpp index 884ffadab478..7aa396a80a5f 100644 --- a/src/grids.hpp +++ b/src/grids.hpp @@ -100,6 +100,7 @@ class PROJ_GCC_DLL VerticalShiftGrid : public Grid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -239,6 +240,9 @@ class PROJ_GCC_DLL VerticalShiftGrid : public Grid { ======= PROJ_FOR_TEST const VerticalShiftGrid *gridAt(double lon, double lat) const; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + PROJ_FOR_TEST const VerticalShiftGrid *gridAt(double lon, double lat) const; +>>>>>>> locationtech-main PROJ_FOR_TEST virtual bool isNodata(float /*val*/, double /* multiplier */) const = 0; @@ -278,6 +282,7 @@ class PROJ_GCC_DLL VerticalShiftGridSet { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -417,6 +422,9 @@ class PROJ_GCC_DLL VerticalShiftGridSet { ======= PROJ_FOR_TEST const VerticalShiftGrid *gridAt(double lon, double lat) const; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + PROJ_FOR_TEST const VerticalShiftGrid *gridAt(double lon, double lat) const; +>>>>>>> locationtech-main PROJ_FOR_TEST virtual void reassign_context(PJ_CONTEXT *ctx); PROJ_FOR_TEST virtual bool reopen(PJ_CONTEXT *ctx); @@ -441,6 +449,7 @@ class PROJ_GCC_DLL HorizontalShiftGrid : public Grid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -563,6 +572,9 @@ class PROJ_GCC_DLL HorizontalShiftGrid : public Grid { ======= PROJ_FOR_TEST const HorizontalShiftGrid *gridAt(double lon, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + PROJ_FOR_TEST const HorizontalShiftGrid *gridAt(double lon, +>>>>>>> locationtech-main double lat) const; // x = 0 is western-most column, y = 0 is southern-most line @@ -575,6 +587,7 @@ class PROJ_GCC_DLL HorizontalShiftGrid : public Grid { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -697,6 +710,9 @@ class PROJ_GCC_DLL HorizontalShiftGrid : public Grid { ======= float &lonShift, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + float &lonShift, +>>>>>>> locationtech-main float &latShift) const = 0; PROJ_FOR_TEST virtual void reassign_context(PJ_CONTEXT *ctx) = 0; @@ -731,6 +747,7 @@ class PROJ_GCC_DLL HorizontalShiftGridSet { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -853,6 +870,9 @@ class PROJ_GCC_DLL HorizontalShiftGridSet { ======= PROJ_FOR_TEST const HorizontalShiftGrid *gridAt(double lon, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + PROJ_FOR_TEST const HorizontalShiftGrid *gridAt(double lon, +>>>>>>> locationtech-main double lat) const; PROJ_FOR_TEST virtual void reassign_context(PJ_CONTEXT *ctx); diff --git a/src/init.cpp b/src/init.cpp index 226e1a1e076a..38386accdce2 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -780,6 +780,7 @@ pj_init_ctx_with_allow_init_epsg(PJ_CONTEXT *ctx, int argc, char **argv, int all <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1066,6 +1067,9 @@ pj_init_ctx_with_allow_init_epsg(PJ_CONTEXT *ctx, int argc, char **argv, int all ======= geod_init(PIN->geod, PIN->a, PIN->es / (1 + sqrt (PIN->one_es))); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + geod_init(PIN->geod, PIN->a, PIN->f); +>>>>>>> locationtech-main /* Projection specific initialization */ err = proj_errno_reset (PIN); diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index d3ee232ad92d..c160b895174e 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -41,6 +41,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #include ======= <<<<<<< HEAD @@ -145,6 +146,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #include #include #include @@ -160,6 +163,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #include "proj/coordinates.hpp" ======= <<<<<<< HEAD @@ -264,6 +268,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #include "proj/coordinatesystem.hpp" #include "proj/crs.hpp" #include "proj/datum.hpp" @@ -291,6 +297,7 @@ using namespace NS_PROJ::common; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD using namespace NS_PROJ::coordinates; ======= <<<<<<< HEAD @@ -395,6 +402,8 @@ using namespace NS_PROJ::coordinates; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main using namespace NS_PROJ::crs; using namespace NS_PROJ::cs; using namespace NS_PROJ::datum; @@ -527,6 +536,7 @@ getDBcontextNoException(PJ_CONTEXT *ctx, const char *function) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -649,6 +659,9 @@ static PJ *pj_obj_create(PJ_CONTEXT *ctx, const IdentifiedObjectNNPtr &objIn) { ======= static PJ *pj_obj_create(PJ_CONTEXT *ctx, const IdentifiedObjectNNPtr &objIn) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static PJ *pj_obj_create(PJ_CONTEXT *ctx, const IdentifiedObjectNNPtr &objIn) { +>>>>>>> locationtech-main auto coordop = dynamic_cast(objIn.get()); if (coordop) { auto dbContext = getDBcontextNoException(ctx, __FUNCTION__); @@ -671,6 +684,7 @@ static PJ *pj_obj_create(PJ_CONTEXT *ctx, const IdentifiedObjectNNPtr &objIn) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -812,6 +826,8 @@ static PJ *pj_obj_create(PJ_CONTEXT *ctx, const IdentifiedObjectNNPtr &objIn) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return pj; } } catch (const std::exception &) { @@ -1137,6 +1153,7 @@ PJ *proj_clone(PJ_CONTEXT *ctx, const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1251,6 +1268,8 @@ PJ *proj_clone(PJ_CONTEXT *ctx, const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main for (const auto &altOp : obj->alternativeCoordinateOperations) { newPj->alternativeCoordinateOperations.emplace_back( PJCoordOperation(ctx, altOp)); @@ -1261,6 +1280,7 @@ PJ *proj_clone(PJ_CONTEXT *ctx, const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ctx->debug_level = old_debug_level; ======= @@ -1366,6 +1386,8 @@ PJ *proj_clone(PJ_CONTEXT *ctx, const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } return newPj; } @@ -1417,6 +1439,7 @@ PJ *proj_create(PJ_CONTEXT *ctx, const char *text) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1505,6 +1528,8 @@ PJ *proj_create(PJ_CONTEXT *ctx, const char *text) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main auto identifiedObject = nn_dynamic_pointer_cast( createFromUserInput(text, ctx)); if (identifiedObject) { @@ -1515,6 +1540,7 @@ PJ *proj_create(PJ_CONTEXT *ctx, const char *text) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1611,6 +1637,8 @@ PJ *proj_create(PJ_CONTEXT *ctx, const char *text) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } } catch (const io::ParsingException &e) { if (proj_context_errno(ctx) == 0) { @@ -1701,6 +1729,7 @@ PJ *proj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1841,6 +1870,10 @@ PJ *proj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, auto obj = nn_dynamic_pointer_cast( parser.createFromWKT(wkt)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto obj = nn_dynamic_pointer_cast( + parser.createFromWKT(wkt)); +>>>>>>> locationtech-main std::vector warningsFromParsing; if (out_grammar_errors) { @@ -1865,6 +1898,7 @@ PJ *proj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1987,6 +2021,9 @@ PJ *proj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, ======= if (obj && out_warnings) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (obj && out_warnings) { +>>>>>>> locationtech-main auto derivedCRS = dynamic_cast(obj.get()); if (derivedCRS) { auto warnings = @@ -2015,6 +2052,7 @@ PJ *proj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2161,6 +2199,11 @@ PJ *proj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, return pj_obj_create(ctx, NN_NO_CHECK(obj)); } >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (obj) { + return pj_obj_create(ctx, NN_NO_CHECK(obj)); + } +>>>>>>> locationtech-main } catch (const std::exception &e) { if (out_grammar_errors) { std::list exc{e.what()}; @@ -2565,6 +2608,7 @@ convertPJObjectTypeToObjectType(PJ_TYPE type, bool &valid) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2695,6 +2739,8 @@ convertPJObjectTypeToObjectType(PJ_TYPE type, bool &valid) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } return cppType; } @@ -2866,6 +2912,7 @@ PJ_TYPE proj_get_type(const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2996,6 +3043,8 @@ PJ_TYPE proj_get_type(const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return PJ_TYPE_UNKNOWN; }; @@ -3018,6 +3067,7 @@ int proj_is_deprecated(const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3094,6 +3144,8 @@ int proj_is_deprecated(const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!obj || !obj->iso_obj) { return false; } @@ -3104,6 +3156,7 @@ int proj_is_deprecated(const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3224,6 +3277,8 @@ int proj_is_deprecated(const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -3295,6 +3350,7 @@ static int proj_is_equivalent_to_internal(PJ_CONTEXT *ctx, const PJ *obj, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3447,6 +3503,9 @@ static int proj_is_equivalent_to_internal(PJ_CONTEXT *ctx, const PJ *obj, ======= if (!obj->iso_obj || !other->iso_obj) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (!obj->iso_obj || !other->iso_obj) { +>>>>>>> locationtech-main return false; } const auto cppCriterion = ([](PJ_COMPARISON_CRITERION l_criterion) { @@ -3468,6 +3527,7 @@ static int proj_is_equivalent_to_internal(PJ_CONTEXT *ctx, const PJ *obj, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3613,6 +3673,10 @@ static int proj_is_equivalent_to_internal(PJ_CONTEXT *ctx, const PJ *obj, int res = obj->iso_obj->isEquivalentTo( other->iso_obj.get(), cppCriterion, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + int res = obj->iso_obj->isEquivalentTo( + other->iso_obj.get(), cppCriterion, +>>>>>>> locationtech-main ctx ? getDBcontextNoException(ctx, "proj_is_equivalent_to_with_ctx") : nullptr); return res; @@ -3684,6 +3748,7 @@ const char *proj_get_name(const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3760,6 +3825,8 @@ const char *proj_get_name(const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!obj || !obj->iso_obj) { return nullptr; } @@ -3770,6 +3837,7 @@ const char *proj_get_name(const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3890,6 +3958,8 @@ const char *proj_get_name(const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!desc.has_value()) { return nullptr; } @@ -3915,6 +3985,7 @@ const char *proj_get_remarks(const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4065,6 +4136,9 @@ const char *proj_get_remarks(const PJ *obj) { ======= if (!obj || !obj->iso_obj) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (!obj || !obj->iso_obj) { +>>>>>>> locationtech-main return nullptr; } // The object will still be alive after the function call. @@ -4076,6 +4150,7 @@ const char *proj_get_remarks(const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4198,6 +4273,9 @@ const char *proj_get_remarks(const PJ *obj) { ======= return obj->iso_obj->remarks().c_str(); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return obj->iso_obj->remarks().c_str(); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -4218,6 +4296,7 @@ const char *proj_get_id_auth_name(const PJ *obj, int index) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4294,6 +4373,8 @@ const char *proj_get_id_auth_name(const PJ *obj, int index) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!obj || !obj->iso_obj) { return nullptr; } @@ -4304,6 +4385,7 @@ const char *proj_get_id_auth_name(const PJ *obj, int index) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4424,6 +4506,8 @@ const char *proj_get_id_auth_name(const PJ *obj, int index) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (static_cast(index) >= ids.size()) { return nullptr; } @@ -4454,6 +4538,7 @@ const char *proj_get_id_code(const PJ *obj, int index) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4530,6 +4615,8 @@ const char *proj_get_id_code(const PJ *obj, int index) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!obj || !obj->iso_obj) { return nullptr; } @@ -4540,6 +4627,7 @@ const char *proj_get_id_code(const PJ *obj, int index) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4660,6 +4748,8 @@ const char *proj_get_id_code(const PJ *obj, int index) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (static_cast(index) >= ids.size()) { return nullptr; } @@ -4719,6 +4809,7 @@ const char *proj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, PJ_WKT_TYPE type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4858,6 +4949,9 @@ const char *proj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, PJ_WKT_TYPE type, ======= if (!obj->iso_obj) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (!obj->iso_obj) { +>>>>>>> locationtech-main return nullptr; } @@ -4918,6 +5012,7 @@ const char *proj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, PJ_WKT_TYPE type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5040,6 +5135,9 @@ const char *proj_as_wkt(PJ_CONTEXT *ctx, const PJ *obj, PJ_WKT_TYPE type, ======= obj->lastWKT = obj->iso_obj->exportToWKT(formatter.get()); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + obj->lastWKT = obj->iso_obj->exportToWKT(formatter.get()); +>>>>>>> locationtech-main return obj->lastWKT.c_str(); } catch (const std::exception &e) { proj_log_error(ctx, __FUNCTION__, e.what()); @@ -5657,6 +5755,7 @@ const char *proj_get_celestial_body_name(PJ_CONTEXT *ctx, const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5779,6 +5878,9 @@ const char *proj_get_celestial_body_name(PJ_CONTEXT *ctx, const PJ *obj) { ======= const IdentifiedObject *ptr = obj->iso_obj.get(); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const IdentifiedObject *ptr = obj->iso_obj.get(); +>>>>>>> locationtech-main if (dynamic_cast(ptr)) { const auto geodCRS = extractGeodeticCRS(ctx, obj, __FUNCTION__); if (!geodCRS) { @@ -5989,6 +6091,7 @@ int proj_prime_meridian_get_parameters(PJ_CONTEXT *ctx, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6111,6 +6214,9 @@ int proj_prime_meridian_get_parameters(PJ_CONTEXT *ctx, ======= * the source CRS of a CoordinateOperation. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * the source CRS of a CoordinateOperation. +>>>>>>> locationtech-main * * The returned object must be unreferenced with proj_destroy() after * use. @@ -6154,6 +6260,7 @@ PJ *proj_get_source_crs(PJ_CONTEXT *ctx, const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6323,6 +6430,10 @@ PJ *proj_get_source_crs(PJ_CONTEXT *ctx, const PJ *obj) { proj_log_error(ctx, __FUNCTION__, "Object is not a BoundCRS or a CoordinateOperation"); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + proj_log_error(ctx, __FUNCTION__, + "Object is not a BoundCRS or a CoordinateOperation"); +>>>>>>> locationtech-main return nullptr; } @@ -8916,6 +9027,7 @@ PJ *proj_create_conversion_two_point_equidistant( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -9070,6 +9182,11 @@ PJ *proj_create_conversion_two_point_equidistant( * * See osgeo::proj::operation::Conversion::createTunisiaMappingGrid(). >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * Mapping Grid projection method. + * + * See osgeo::proj::operation::Conversion::createTunisiaMappingGrid(). +>>>>>>> locationtech-main * * Linear parameters are expressed in (linear_unit_name, * linear_unit_conv_factor). @@ -9081,6 +9198,7 @@ PJ *proj_create_conversion_two_point_equidistant( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9243,6 +9361,8 @@ PJ *proj_create_conversion_tunisia_mining_grid( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main */ PJ *proj_create_conversion_tunisia_mapping_grid( PJ_CONTEXT *ctx, double center_lat, double center_long, @@ -9262,6 +9382,7 @@ PJ *proj_create_conversion_tunisia_mapping_grid( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9384,6 +9505,9 @@ PJ *proj_create_conversion_tunisia_mapping_grid( ======= auto conv = Conversion::createTunisiaMappingGrid( >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto conv = Conversion::createTunisiaMappingGrid( +>>>>>>> locationtech-main PropertyMap(), Angle(center_lat, angUnit), Angle(center_long, angUnit), Length(false_easting, linearUnit), Length(false_northing, linearUnit)); @@ -12537,6 +12661,7 @@ proj_create_operations(PJ_CONTEXT *ctx, const PJ *source_crs, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -12821,6 +12946,8 @@ proj_create_operations(PJ_CONTEXT *ctx, const PJ *source_crs, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!sourceCRS) { proj_log_error(ctx, __FUNCTION__, "source_crs is not a CRS"); return nullptr; @@ -12830,6 +12957,7 @@ proj_create_operations(PJ_CONTEXT *ctx, const PJ *source_crs, proj_log_error(ctx, __FUNCTION__, "target_crs is not a CRS"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -12852,6 +12980,8 @@ proj_create_operations(PJ_CONTEXT *ctx, const PJ *source_crs, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return nullptr; } @@ -12865,6 +12995,7 @@ proj_create_operations(PJ_CONTEXT *ctx, const PJ *source_crs, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13051,6 +13182,11 @@ proj_create_operations(PJ_CONTEXT *ctx, const PJ *source_crs, NN_NO_CHECK(sourceCRS), NN_NO_CHECK(targetCRS), operationContext->operationContext); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto ops = factory->createOperations( + NN_NO_CHECK(sourceCRS), NN_NO_CHECK(targetCRS), + operationContext->operationContext); +>>>>>>> locationtech-main for (const auto &op : ops) { objects.emplace_back(op); } @@ -13694,6 +13830,7 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13871,6 +14008,11 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) { pj_obj_create(ctx, co->normalizeForVisualization()); pjNormalized->over = alt.pj->over; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto pjNormalized = + pj_obj_create(ctx, co->normalizeForVisualization()); + pjNormalized->over = alt.pj->over; +>>>>>>> locationtech-main pjNew->alternativeCoordinateOperations.emplace_back( alt.idxInOriginalList, minxSrc, minySrc, maxxSrc, maxySrc, minxDst, minyDst, maxxDst, maxyDst, @@ -13886,6 +14028,7 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ctx->forceOver = false; ======= @@ -13991,6 +14134,8 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main proj_log_debug(ctx, __FUNCTION__, e.what()); return nullptr; } @@ -14022,6 +14167,7 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -14188,12 +14334,15 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main auto pjNormalized = pj_obj_create(ctx, co->normalizeForVisualization()); pjNormalized->over = obj->over; return pjNormalized; } catch (const std::exception &e) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -14216,6 +14365,8 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main proj_log_debug(ctx, __FUNCTION__, e.what()); return nullptr; } @@ -14614,6 +14765,7 @@ proj_get_geoid_models_from_database(PJ_CONTEXT *ctx, const char *auth_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14767,3 +14919,5 @@ double proj_coordinate_metadata_get_epoch(PJ_CONTEXT *ctx, const PJ *obj) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main diff --git a/src/iso19111/coordinatesystem.cpp b/src/iso19111/coordinatesystem.cpp index 489e12532558..e549bd3c7206 100644 --- a/src/iso19111/coordinatesystem.cpp +++ b/src/iso19111/coordinatesystem.cpp @@ -180,6 +180,7 @@ struct CoordinateSystemAxis::Private { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -252,6 +253,8 @@ struct CoordinateSystemAxis::Private { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main util::optional minimumValue{}; util::optional maximumValue{}; MeridianPtr meridian{}; @@ -262,6 +265,7 @@ struct CoordinateSystemAxis::Private { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -369,6 +373,8 @@ struct CoordinateSystemAxis::Private { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; //! @endcond @@ -472,6 +478,7 @@ CoordinateSystemAxis::maximumValue() PROJ_PURE_DEFN { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -610,6 +617,8 @@ CoordinateSystemAxis::rangeMeaning() PROJ_PURE_DEFN { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Return the meridian that the axis follows from the pole, for a * coordinate * reference system centered on a pole. @@ -656,6 +665,7 @@ CoordinateSystemAxisNNPtr CoordinateSystemAxis::create( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -819,6 +829,8 @@ CoordinateSystemAxisNNPtr CoordinateSystemAxis::create( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main //! @cond Doxygen_Suppress void CoordinateSystemAxis::_exportToWKT( // cppcheck-suppress passedByValue @@ -927,6 +939,7 @@ void CoordinateSystemAxis::_exportToWKT(io::WKTFormatter *formatter, int order, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1071,6 +1084,8 @@ void CoordinateSystemAxis::_exportToWKT(io::WKTFormatter *formatter, int order, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (formatter->outputId()) { formatID(formatter); } @@ -1121,6 +1136,7 @@ void CoordinateSystemAxis::_exportToJSON( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1263,6 +1279,8 @@ void CoordinateSystemAxis::_exportToJSON( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (formatter->outputId()) { formatID(formatter); } @@ -2087,6 +2105,7 @@ AxisDirection::AxisDirection(const std::string &nameIn) : CodeList(nameIn) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2235,6 +2254,10 @@ AxisDirection::AxisDirection(const std::string &nameIn) : CodeList(nameIn) { assert(registry.find(nameIn) == registry.end()); registry[nameIn] = this; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + assert(registry.find(nameIn) == registry.end()); + registry[nameIn] = this; +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -2249,6 +2272,7 @@ AxisDirection::valueOf(const std::string &nameIn) noexcept { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2418,6 +2442,9 @@ const RangeMeaning *RangeMeaning::valueOf(const std::string &nameIn) noexcept { ======= auto iter = registry.find(nameIn); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto iter = registry.find(nameIn); +>>>>>>> locationtech-main if (iter == registry.end()) return nullptr; return iter->second; @@ -2436,6 +2463,7 @@ AxisDirectionWKT1::AxisDirectionWKT1(const std::string &nameIn) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2584,6 +2612,10 @@ AxisDirectionWKT1::AxisDirectionWKT1(const std::string &nameIn) assert(registry.find(nameIn) == registry.end()); registry[nameIn] = this; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + assert(registry.find(nameIn) == registry.end()); + registry[nameIn] = this; +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -2596,6 +2628,7 @@ const AxisDirectionWKT1 *AxisDirectionWKT1::valueOf(const std::string &nameIn) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2718,6 +2751,9 @@ const AxisDirectionWKT1 *AxisDirectionWKT1::valueOf(const std::string &nameIn) { ======= auto iter = registry.find(nameIn); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto iter = registry.find(nameIn); +>>>>>>> locationtech-main if (iter == registry.end()) return nullptr; return iter->second; diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index d5d2f0b2c87a..e1ad3f7287a3 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -186,6 +186,7 @@ const BoundCRSPtr &CRS::canonicalBoundCRS() PROJ_PURE_DEFN { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -357,6 +358,8 @@ bool CRS::isDynamic(bool considerWGS84AsDynamic) const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Return the GeodeticCRS of the CRS. * * Returns the GeodeticCRS contained in a CRS. This works currently with @@ -803,6 +806,7 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -925,6 +929,9 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( ======= bool candidateHasExactlyMachingExtent = false; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool candidateHasExactlyMachingExtent = false; +>>>>>>> locationtech-main for (const auto &op : list) { auto transf = util::nn_dynamic_pointer_cast( @@ -951,6 +958,7 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1023,6 +1031,8 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main !candidateHasExactlyMachingExtent) { candidateBoundCRS = nullptr; } else if (exactlyMatchingExtent == @@ -1033,6 +1043,7 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1140,6 +1151,8 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main candidateCount++; } } @@ -1152,6 +1165,7 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1274,6 +1288,9 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( ======= candidateHasExactlyMachingExtent = >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + candidateHasExactlyMachingExtent = +>>>>>>> locationtech-main exactlyMatchingExtent; candidateBoundCRS = BoundCRS::create(thisAsCRS, hubCRS, @@ -1328,6 +1345,7 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1401,6 +1419,8 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main !candidateHasExactlyMachingExtent) { candidateBoundCRS = nullptr; } else if ( @@ -1412,6 +1432,7 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1521,6 +1542,8 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main candidateCount++; } } @@ -1533,6 +1556,7 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1655,6 +1679,9 @@ CRSNNPtr CRS::createBoundCRSToWGS84IfPossible( ======= candidateHasExactlyMachingExtent = >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + candidateHasExactlyMachingExtent = +>>>>>>> locationtech-main exactlyMatchingExtent; candidateBoundCRS = BoundCRS::create( @@ -5239,6 +5266,7 @@ void ProjectedCRS::_exportToWKT(io::WKTFormatter *formatter) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5361,6 +5389,9 @@ void ProjectedCRS::_exportToWKT(io::WKTFormatter *formatter) const { ======= // If the id of the objet is in the ESRI namespace, then >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // If the id of the objet is in the ESRI namespace, then +>>>>>>> locationtech-main // try to find the full ESRI WKT from the database const auto definition = dbContext->getTextDefinition( "projected_crs", "ESRI", l_identifiers[0]->code()); @@ -5914,6 +5945,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6206,6 +6238,10 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { ======= const auto addCRS = [&](const ProjectedCRSNNPtr &crs, const bool eqName) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const auto addCRS = [&](const ProjectedCRSNNPtr &crs, const bool eqName, + bool hasNonMatchingId) { +>>>>>>> locationtech-main const auto &l_unit = cs->axisList()[0]->unit(); if (_isEquivalentTo(crs.get(), util::IComparable::Criterion:: @@ -6233,6 +6269,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6519,6 +6556,9 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { ======= res.emplace_back(crs, 100); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + res.emplace_back(crs, hasNonMatchingId ? 70 : 100); +>>>>>>> locationtech-main } else { res.emplace_back(crs, eqName ? 90 : 70); } @@ -6567,6 +6607,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6837,6 +6878,9 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool hasNonMatchingId = false; +>>>>>>> locationtech-main if (hasCodeCompatibleOfAuthorityFactory(this, authorityFactory)) { // If the CRS has already an id, check in the database for the // official object, and verify that they are equivalent. @@ -6861,6 +6905,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7163,6 +7208,11 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { ======= return res; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (match) { + return res; + } +>>>>>>> locationtech-main } catch (const std::exception &) { } } @@ -7175,6 +7225,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7445,6 +7496,9 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + hasNonMatchingId = true; +>>>>>>> locationtech-main } else if (!insignificantName) { for (int ipass = 0; ipass < 2; ipass++) { const bool approximateMatch = ipass == 1; @@ -7468,6 +7522,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7754,6 +7809,9 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { ======= if (addCRS(crsNN, eqName).second == 100) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (addCRS(crsNN, eqName, false).second == 100) { +>>>>>>> locationtech-main return res; } } @@ -7797,6 +7855,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8090,6 +8149,9 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { if (!hasCodeCompatibleOfAuthorityFactory(this, authorityFactory) && !foundEquivalentName && (res.empty() || res.front().second < 50)) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (!foundEquivalentName && (res.empty() || res.front().second < 50)) { +>>>>>>> locationtech-main std::set> alreadyKnown; for (const auto &pair : res) { const auto &ids = pair.first->identifiers(); @@ -8119,6 +8181,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8405,6 +8468,9 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const { ======= addCRS(crs, insignificantName); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + addCRS(crs, insignificantName, hasNonMatchingId); +>>>>>>> locationtech-main } res.sort(lambdaSort); diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index f6edcddeff10..86a4122c0404 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -96,6 +96,7 @@ struct Datum::Private { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -210,6 +211,8 @@ struct Datum::Private { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main util::optional publicationDate{}; common::IdentifiedObjectPtr conventionalRS{}; @@ -224,6 +227,7 @@ struct Datum::Private { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -376,6 +380,9 @@ struct Datum::Private { ======= void exportAnchorDefinition(io::JSONFormatter *formatter) const; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + void exportAnchorDefinition(io::JSONFormatter *formatter) const; +>>>>>>> locationtech-main }; // --------------------------------------------------------------------------- @@ -397,6 +404,7 @@ void Datum::Private::exportAnchorDefinition(io::WKTFormatter *formatter) const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -534,6 +542,8 @@ void Datum::Private::exportAnchorEpoch(io::WKTFormatter *formatter) const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main void Datum::Private::exportAnchorDefinition( io::JSONFormatter *formatter) const { if (anchorDefinition) { @@ -550,6 +560,7 @@ void Datum::Private::exportAnchorDefinition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -686,6 +697,8 @@ void Datum::Private::exportAnchorEpoch(io::JSONFormatter *formatter) const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main //! @endcond // --------------------------------------------------------------------------- @@ -740,6 +753,7 @@ const util::optional &Datum::anchorDefinition() const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -885,6 +899,8 @@ const util::optional &Datum::anchorEpoch() const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Return the date on which the datum definition was published. * * \note Departure from \ref ISO_19111_2019 : we return a DateTime instead of @@ -926,6 +942,7 @@ void Datum::setAnchor(const util::optional &anchor) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1059,6 +1076,8 @@ void Datum::setAnchorEpoch(const util::optional &anchorEpoch) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main void Datum::setProperties( const util::PropertyMap &properties) // throw(InvalidValueTypeException) { @@ -1976,6 +1995,7 @@ std::string Ellipsoid::guessBodyName(const io::DatabaseContextPtr &dbContext, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2125,6 +2145,9 @@ std::string Ellipsoid::guessBodyName(const io::DatabaseContextPtr &dbContext, ======= constexpr double relError = 0.005; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + constexpr double relError = 0.005; +>>>>>>> locationtech-main constexpr double earthMeanRadius = 6375000.0; if (std::fabs(a - earthMeanRadius) < relError * earthMeanRadius) { return Ellipsoid::EARTH; @@ -2207,6 +2230,7 @@ const EllipsoidNNPtr &GeodeticReferenceFrame::ellipsoid() PROJ_PURE_DEFN { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -2311,6 +2335,8 @@ const EllipsoidNNPtr &GeodeticReferenceFrame::ellipsoid() PROJ_PURE_DEFN { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main // --------------------------------------------------------------------------- /** \brief Instantiate a GeodeticReferenceFrame @@ -2344,6 +2370,7 @@ GeodeticReferenceFrame::create(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2497,6 +2524,8 @@ GeodeticReferenceFrameNNPtr GeodeticReferenceFrame::create( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const GeodeticReferenceFrameNNPtr GeodeticReferenceFrame::createEPSG_6267() { return create(createMapNameEPSGCode("North American Datum 1927", 6267), Ellipsoid::CLARKE_1866, util::optional(), @@ -2621,6 +2650,7 @@ void GeodeticReferenceFrame::_exportToWKT( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2748,6 +2778,8 @@ void GeodeticReferenceFrame::_exportToWKT( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } else { const auto &TOWGS84Params = formatter->getTOWGS84Parameters(); if (TOWGS84Params.size() == 7) { @@ -2808,6 +2840,7 @@ void GeodeticReferenceFrame::_exportToJSON( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Datum::getPrivate()->exportAnchorEpoch(formatter); ======= @@ -2913,6 +2946,8 @@ void GeodeticReferenceFrame::_exportToJSON( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (dynamicGRF) { writer->AddObjKey("frame_reference_epoch"); @@ -3543,6 +3578,7 @@ VerticalReferenceFrameNNPtr VerticalReferenceFrame::create( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3695,6 +3731,8 @@ VerticalReferenceFrameNNPtr VerticalReferenceFrame::create( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main //! @cond Doxygen_Suppress const std::string &VerticalReferenceFrame::getWKT1DatumType() const { return d->wkt1DatumType_; @@ -3755,6 +3793,7 @@ void VerticalReferenceFrame::_exportToWKT( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3882,6 +3921,8 @@ void VerticalReferenceFrame::_exportToWKT( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } else if (!formatter->useESRIDialect()) { formatter->add(d->wkt1DatumType_); const auto &extension = formatter->getVDatumExtension(); @@ -3927,6 +3968,7 @@ void VerticalReferenceFrame::_exportToJSON( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Datum::getPrivate()->exportAnchorEpoch(formatter); ======= @@ -4032,6 +4074,8 @@ void VerticalReferenceFrame::_exportToJSON( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (dynamicGRF) { writer->AddObjKey("frame_reference_epoch"); diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index 45517ab9d7ff..cc100844eec9 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -1811,6 +1811,7 @@ void DatabaseContext::Private::identify(const DatabaseContextNNPtr &dbContext, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1884,6 +1885,8 @@ void DatabaseContext::Private::identify(const DatabaseContextNNPtr &dbContext, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main // preferred coordinate system for geographic lat, lon return; } @@ -1895,6 +1898,7 @@ void DatabaseContext::Private::identify(const DatabaseContextNNPtr &dbContext, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2004,6 +2008,8 @@ void DatabaseContext::Private::identify(const DatabaseContextNNPtr &dbContext, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return; } } diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index 2dbc1c25f668..4a0bdbe316fe 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -54,6 +54,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #include "proj/coordinates.hpp" ======= <<<<<<< HEAD @@ -158,6 +159,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #include "proj/coordinatesystem.hpp" #include "proj/crs.hpp" #include "proj/datum.hpp" @@ -196,6 +199,7 @@ using namespace NS_PROJ::common; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD using namespace NS_PROJ::coordinates; ======= <<<<<<< HEAD @@ -300,6 +304,8 @@ using namespace NS_PROJ::coordinates; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main using namespace NS_PROJ::crs; using namespace NS_PROJ::cs; using namespace NS_PROJ::datum; @@ -1566,6 +1572,7 @@ struct WKTParser::Private { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1680,6 +1687,8 @@ struct WKTParser::Private { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main static void parseDynamic(const WKTNodeNNPtr &dynamicNode, double &frameReferenceEpoch, util::optional &modelName); @@ -1826,6 +1835,7 @@ struct WKTParser::Private { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1940,6 +1950,8 @@ struct WKTParser::Private { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; //! @endcond @@ -2676,6 +2688,7 @@ optional WKTParser::Private::getAnchor(const WKTNodeNNPtr &node) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2819,6 +2832,8 @@ WKTParser::Private::getAnchorEpoch(const WKTNodeNNPtr &node) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main static const PrimeMeridianNNPtr & fixupPrimeMeridan(const EllipsoidNNPtr &ellipsoid, const PrimeMeridianNNPtr &pm) { @@ -3058,6 +3073,7 @@ GeodeticReferenceFrameNNPtr WKTParser::Private::buildGeodeticReferenceFrame( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3206,6 +3222,10 @@ GeodeticReferenceFrameNNPtr WKTParser::Private::buildGeodeticReferenceFrame( return GeodeticReferenceFrame::create( properties, ellipsoid, getAnchor(node), primeMeridianModified); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return GeodeticReferenceFrame::create( + properties, ellipsoid, getAnchor(node), primeMeridianModified); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -3384,6 +3404,7 @@ WKTParser::Private::buildAxis(const WKTNodeNNPtr &node, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3527,6 +3548,11 @@ WKTParser::Private::buildAxis(const WKTNodeNNPtr &node, AxisDirectionWKT1::valueOf(toupper(dirString)) != nullptr) { direction = AxisDirection::valueOf(tolower(dirString)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + } else if (!direction && + AxisDirectionWKT1::valueOf(toupper(dirString)) != nullptr) { + direction = AxisDirection::valueOf(tolower(dirString)); +>>>>>>> locationtech-main } if (!direction) { @@ -3554,6 +3580,7 @@ WKTParser::Private::buildAxis(const WKTNodeNNPtr &node, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3775,6 +3802,11 @@ WKTParser::Private::buildAxis(const WKTNodeNNPtr &node, buildProperties(node).set(IdentifiedObject::NAME_KEY, axisName), abbreviation, *direction, unit, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return CoordinateSystemAxis::create( + buildProperties(node).set(IdentifiedObject::NAME_KEY, axisName), + abbreviation, *direction, unit, +>>>>>>> locationtech-main !isNull(meridianNode) ? buildMeridian(meridianNode).as_nullable() : nullptr); } @@ -5642,6 +5674,7 @@ VerticalReferenceFrameNNPtr WKTParser::Private::buildVerticalReferenceFrame( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5781,6 +5814,9 @@ VerticalReferenceFrameNNPtr WKTParser::Private::buildVerticalReferenceFrame( ======= return VerticalReferenceFrame::create(props, getAnchor(node)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return VerticalReferenceFrame::create(props, getAnchor(node)); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -6505,6 +6541,7 @@ WKTParser::Private::buildDerivedProjectedCRS(const WKTNodeNNPtr &node) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6665,6 +6702,8 @@ WKTParser::Private::buildCoordinateMetadata(const WKTNodeNNPtr &node) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main static bool isGeodeticCRS(const std::string &name) { return ci_equal(name, WKTConstants::GEODCRS) || // WKT2 ci_equal(name, WKTConstants::GEODETICCRS) || // WKT2 @@ -6902,6 +6941,7 @@ BaseObjectNNPtr WKTParser::Private::build(const WKTNodeNNPtr &node) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7033,6 +7073,8 @@ BaseObjectNNPtr WKTParser::Private::build(const WKTNodeNNPtr &node) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main throw ParsingException(concat("unhandled keyword: ", name)); } @@ -7085,6 +7127,7 @@ class JSONParser { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD CoordinateMetadataNNPtr buildCoordinateMetadata(const json &j); ======= @@ -7190,6 +7233,8 @@ class JSONParser { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main void buildGeodeticDatumOrDatumEnsemble(const json &j, GeodeticReferenceFramePtr &datum, @@ -7210,6 +7255,7 @@ class JSONParser { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7344,6 +7390,8 @@ class JSONParser { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EngineeringDatumNNPtr buildEngineeringDatum(const json &j) { return EngineeringDatum::create(buildProperties(j), getAnchor(j)); } @@ -7869,6 +7917,7 @@ BaseObjectNNPtr JSONParser::create(const json &j) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7996,6 +8045,8 @@ BaseObjectNNPtr JSONParser::create(const json &j) >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (type == "Axis") { return buildAxis(j); } @@ -8379,6 +8430,7 @@ JSONParser::buildConcatenatedOperation(const json &j) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8522,6 +8574,8 @@ CoordinateMetadataNNPtr JSONParser::buildCoordinateMetadata(const json &j) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main MeridianNNPtr JSONParser::buildMeridian(const json &j) { if (!j.contains("longitude")) { throw ParsingException("Missing \"longitude\" key"); @@ -8558,6 +8612,7 @@ CoordinateSystemAxisNNPtr JSONParser::buildAxis(const json &j) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8744,6 +8799,10 @@ CoordinateSystemAxisNNPtr JSONParser::buildAxis(const json &j) { return CoordinateSystemAxis::create(buildProperties(j), abbreviation, *direction, unit, meridian); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return CoordinateSystemAxis::create(buildProperties(j), abbreviation, + *direction, unit, meridian); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -8921,6 +8980,7 @@ JSONParser::buildGeodeticReferenceFrame(const json &j) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -9069,6 +9129,10 @@ JSONParser::buildGeodeticReferenceFrame(const json &j) { return GeodeticReferenceFrame::create( buildProperties(j), buildEllipsoid(ellipsoidJ), getAnchor(j), pm); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return GeodeticReferenceFrame::create( + buildProperties(j), buildEllipsoid(ellipsoidJ), getAnchor(j), pm); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -9104,6 +9168,7 @@ JSONParser::buildVerticalReferenceFrame(const json &j) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -9243,6 +9308,9 @@ JSONParser::buildVerticalReferenceFrame(const json &j) { ======= return VerticalReferenceFrame::create(buildProperties(j), getAnchor(j)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return VerticalReferenceFrame::create(buildProperties(j), getAnchor(j)); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -9387,6 +9455,7 @@ static CRSNNPtr importFromCRSURL(const std::string &text, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9569,6 +9638,10 @@ static CRSNNPtr importFromCRSURL(const std::string &text, auto factoryCRS = AuthorityFactory::create(dbContext, auth_name); return factoryCRS->createCoordinateReferenceSystem(code, true); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto factoryCRS = AuthorityFactory::create(dbContext, auth_name); + return factoryCRS->createCoordinateReferenceSystem(code, true); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -10279,6 +10352,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10435,6 +10509,8 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main throw ParsingException("unrecognized format / unknown name"); } //! @endcond @@ -10473,6 +10549,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -10612,6 +10689,9 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, ======= * "http://www.opengis.net/def/crs/EPSG/0/4326
  • OGC URL for a compound >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * "http://www.opengis.net/def/crs/EPSG/0/4326
  • OGC URL for a compound +>>>>>>> locationtech-main * CRS. e.g * "http://www.opengis.net/def/crs-compound?1=http://www.opengis.net/def/crs/EPSG/0/4326&2=http://www.opengis.net/def/crs/EPSG/0/3855"
    • *
  • an Object name. e.g "WGS 84", "WGS 84 / UTM zone 31N". In that case as @@ -10624,6 +10704,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10738,6 +10819,8 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main *
  • a compound CRS made from two object names separated with " + ". * e.g. "WGS 84 + EGM96 height"
    • *
  • PROJJSON string
    • @@ -10808,6 +10891,7 @@ BaseObjectNNPtr createFromUserInput(const std::string &text, PJ_CONTEXT *ctx) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10930,6 +11014,9 @@ BaseObjectNNPtr createFromUserInput(const std::string &text, PJ_CONTEXT *ctx) { ======= if (ctx != nullptr && ctx->cpp_context) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (ctx != nullptr && ctx->cpp_context) { +>>>>>>> locationtech-main // Only connect to proj.db if needed if (text.find("proj=") == std::string::npos || text.find("init=") != std::string::npos) { @@ -10941,6 +11028,7 @@ BaseObjectNNPtr createFromUserInput(const std::string &text, PJ_CONTEXT *ctx) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -11063,6 +11151,9 @@ BaseObjectNNPtr createFromUserInput(const std::string &text, PJ_CONTEXT *ctx) { ======= ctx->cpp_context->getDatabaseContext().as_nullable(); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ctx->cpp_context->getDatabaseContext().as_nullable(); +>>>>>>> locationtech-main } } } catch (const std::exception &) { @@ -13408,6 +13499,7 @@ std::string PROJStringParser::Private::guessBodyName(double a) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13563,6 +13655,9 @@ std::string PROJStringParser::Private::guessBodyName(double a) { ======= return Ellipsoid::guessBodyName(dbContext_, a); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return Ellipsoid::guessBodyName(dbContext_, a); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -14350,6 +14445,7 @@ PROJStringParser::Private::buildProjectedCRS(int iStep, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -14423,6 +14519,8 @@ PROJStringParser::Private::buildProjectedCRS(int iStep, >>>>>>> c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= >>>>>>> a30c7d3fa7 (Merge pull request #3523 from rouault/cleanup_aeqd_s_forward) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main bool foundStrictlyMatchingMapping = false; if (mappings.size() >= 2) { @@ -14431,6 +14529,7 @@ PROJStringParser::Private::buildProjectedCRS(int iStep, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) @@ -14745,6 +14844,8 @@ PROJStringParser::Private::buildProjectedCRS(int iStep, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main for (const auto *mappingIter : mappings) { if (mappingIter->proj_name_aux == nullptr) { allMappingsHaveAuxParam = false; @@ -14779,6 +14880,7 @@ PROJStringParser::Private::buildProjectedCRS(int iStep, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15065,6 +15167,9 @@ PROJStringParser::Private::buildProjectedCRS(int iStep, ======= if (mapping) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (mapping && !foundStrictlyMatchingMapping) { +>>>>>>> locationtech-main mapping = selectSphericalOrEllipsoidal(mapping, geodCRS); } diff --git a/src/iso19111/operation/conversion.cpp b/src/iso19111/operation/conversion.cpp index 848f8fd08e38..22ecadfbe6b9 100644 --- a/src/iso19111/operation/conversion.cpp +++ b/src/iso19111/operation/conversion.cpp @@ -324,6 +324,7 @@ Conversion::create(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -472,6 +473,10 @@ Conversion::create(const util::PropertyMap &properties, /** \brief Instantiate a [Universal Transverse Mercator] *(https://proj.org/operations/projections/utm.html) conversion. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a [Universal Transverse Mercator] + *(https://proj.org/operations/projections/utm.html) conversion. +>>>>>>> locationtech-main * * UTM is a family of conversions, of EPSG codes from 16001 to 16060 for the * northern hemisphere, and 17001 to 17060 for the southern hemisphere, @@ -509,6 +514,7 @@ ConversionNNPtr Conversion::createUTM(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -584,6 +590,8 @@ ConversionNNPtr Conversion::createUTM(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Transverse Mercator] *(https://proj.org/operations/projections/tmerc.html) projection method. * @@ -595,6 +603,7 @@ ConversionNNPtr Conversion::createUTM(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -708,6 +717,8 @@ ConversionNNPtr Conversion::createUTM(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -736,6 +747,7 @@ ConversionNNPtr Conversion::createTransverseMercator( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -890,6 +902,11 @@ ConversionNNPtr Conversion::createTransverseMercator( *Mercator] *(https://proj.org/operations/projections/gstmerc.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Gauss Schreiber Transverse + *Mercator] + *(https://proj.org/operations/projections/gstmerc.html) projection method. +>>>>>>> locationtech-main * * This method is also known as Gauss-Laborde Reunion. * @@ -923,6 +940,7 @@ ConversionNNPtr Conversion::createGaussSchreiberTransverseMercator( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -998,6 +1016,8 @@ ConversionNNPtr Conversion::createGaussSchreiberTransverseMercator( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Transverse Mercator South *Orientated] *(https://proj.org/operations/projections/tmerc.html) projection method. @@ -1010,6 +1030,7 @@ ConversionNNPtr Conversion::createGaussSchreiberTransverseMercator( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1123,6 +1144,8 @@ ConversionNNPtr Conversion::createGaussSchreiberTransverseMercator( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -1152,6 +1175,7 @@ ConversionNNPtr Conversion::createTransverseMercatorSouthOriented( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1300,6 +1324,10 @@ ConversionNNPtr Conversion::createTransverseMercatorSouthOriented( /** \brief Instantiate a conversion based on the [Two Point Equidistant] *(https://proj.org/operations/projections/tpeqd.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Two Point Equidistant] + *(https://proj.org/operations/projections/tpeqd.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -1339,6 +1367,7 @@ Conversion::createTwoPointEquidistant(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1487,6 +1516,10 @@ Conversion::createTwoPointEquidistant(const util::PropertyMap &properties, * This method is defined as [EPSG:9816] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9816) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9816] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9816) +>>>>>>> locationtech-main * * \note There is currently no implementation of the method formulas in PROJ. * @@ -1503,6 +1536,7 @@ Conversion::createTwoPointEquidistant(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * @deprecated. Use createTunisiaMiningGrid() instead ======= @@ -1608,6 +1642,8 @@ Conversion::createTwoPointEquidistant(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main */ ConversionNNPtr Conversion::createTunisiaMappingGrid( const util::PropertyMap &properties, const common::Angle ¢erLat, @@ -1621,6 +1657,7 @@ ConversionNNPtr Conversion::createTunisiaMappingGrid( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1743,6 +1780,9 @@ ConversionNNPtr Conversion::createTunisiaMappingGrid( ======= properties, EPSG_CODE_METHOD_TUNISIA_MAPPING_GRID, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + properties, EPSG_CODE_METHOD_TUNISIA_MAPPING_GRID, +>>>>>>> locationtech-main createParams(centerLat, centerLong, falseEasting, falseNorthing)); } @@ -1755,6 +1795,7 @@ ConversionNNPtr Conversion::createTunisiaMappingGrid( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1859,6 +1900,8 @@ ConversionNNPtr Conversion::createTunisiaMiningGrid( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Albers Conic Equal Area] *(https://proj.org/operations/projections/aea.html) projection method. * @@ -1870,6 +1913,7 @@ ConversionNNPtr Conversion::createTunisiaMiningGrid( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2018,6 +2062,8 @@ ConversionNNPtr Conversion::createTunisiaMiningGrid( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @note the order of arguments is conformant with the corresponding EPSG * mode and different than OGRSpatialReference::setACEA() of GDAL <= 2.3 @@ -2055,6 +2101,7 @@ Conversion::createAlbersEqualArea(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2130,6 +2177,8 @@ Conversion::createAlbersEqualArea(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Lambert Conic Conformal 1SP] *(https://proj.org/operations/projections/lcc.html) projection method. * @@ -2141,6 +2190,7 @@ Conversion::createAlbersEqualArea(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2254,6 +2304,8 @@ Conversion::createAlbersEqualArea(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -2282,6 +2334,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_1SP( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2357,6 +2410,8 @@ ConversionNNPtr Conversion::createLambertConicConformal_1SP( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Lambert Conic Conformal (2SP)] *(https://proj.org/operations/projections/lcc.html) projection method. * @@ -2368,6 +2423,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_1SP( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2481,6 +2537,8 @@ ConversionNNPtr Conversion::createLambertConicConformal_1SP( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @note the order of arguments is conformant with the corresponding EPSG * mode and different than OGRSpatialReference::setLCC() of GDAL <= 2.3 @@ -2518,6 +2576,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2593,6 +2652,8 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Lambert Conic Conformal (2SP *Michigan)] *(https://proj.org/operations/projections/lcc.html) projection method. @@ -2605,6 +2666,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2718,6 +2780,8 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -2756,6 +2820,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Michigan( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2831,6 +2896,8 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Michigan( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Lambert Conic Conformal (2SP *Belgium)] *(https://proj.org/operations/projections/lcc.html) projection method. @@ -2843,6 +2910,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Michigan( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2956,6 +3024,8 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Michigan( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * \warning The formulas used currently in PROJ are, incorrectly, the ones of * the regular LCC_2SP method. @@ -2998,6 +3068,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Belgium( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3073,6 +3144,8 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Belgium( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Modified Azimuthal *Equidistant] *(https://proj.org/operations/projections/aeqd.html) projection method. @@ -3085,6 +3158,7 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Belgium( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3198,6 +3272,8 @@ ConversionNNPtr Conversion::createLambertConicConformal_2SP_Belgium( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -3225,6 +3301,7 @@ ConversionNNPtr Conversion::createAzimuthalEquidistant( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3300,6 +3377,8 @@ ConversionNNPtr Conversion::createAzimuthalEquidistant( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Guam Projection] *(https://proj.org/operations/projections/aeqd.html) projection method. * @@ -3311,6 +3390,7 @@ ConversionNNPtr Conversion::createAzimuthalEquidistant( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3424,6 +3504,8 @@ ConversionNNPtr Conversion::createAzimuthalEquidistant( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name *is @@ -3452,6 +3534,7 @@ ConversionNNPtr Conversion::createGuamProjection( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3527,6 +3610,8 @@ ConversionNNPtr Conversion::createGuamProjection( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Bonne] *(https://proj.org/operations/projections/bonne.html) projection method. * @@ -3538,6 +3623,7 @@ ConversionNNPtr Conversion::createGuamProjection( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3651,6 +3737,8 @@ ConversionNNPtr Conversion::createGuamProjection( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -3680,6 +3768,7 @@ ConversionNNPtr Conversion::createBonne(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3755,6 +3844,8 @@ ConversionNNPtr Conversion::createBonne(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Lambert Cylindrical Equal Area *(Spherical)] *(https://proj.org/operations/projections/cea.html) projection method. @@ -3767,6 +3858,7 @@ ConversionNNPtr Conversion::createBonne(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3880,6 +3972,8 @@ ConversionNNPtr Conversion::createBonne(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * \warning The PROJ cea computation code would select the ellipsoidal form if * a non-spherical ellipsoid is used for the base GeographicCRS. @@ -3912,6 +4006,7 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualAreaSpherical( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3987,6 +4082,8 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualAreaSpherical( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Lambert Cylindrical Equal Area *(ellipsoidal form)] *(https://proj.org/operations/projections/cea.html) projection method. @@ -3999,6 +4096,7 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualAreaSpherical( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4112,6 +4210,8 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualAreaSpherical( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -4140,6 +4240,7 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualArea( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4215,6 +4316,8 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualArea( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Cassini-Soldner] * (https://proj.org/operations/projections/cass.html) projection method. * @@ -4226,6 +4329,7 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualArea( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4339,6 +4443,8 @@ ConversionNNPtr Conversion::createLambertCylindricalEqualArea( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -4366,6 +4472,7 @@ ConversionNNPtr Conversion::createCassiniSoldner( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4514,6 +4621,10 @@ ConversionNNPtr Conversion::createCassiniSoldner( /** \brief Instantiate a conversion based on the [Equidistant Conic] *(https://proj.org/operations/projections/eqdc.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Equidistant Conic] + *(https://proj.org/operations/projections/eqdc.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -4551,6 +4662,7 @@ ConversionNNPtr Conversion::createEquidistantConic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4699,6 +4811,10 @@ ConversionNNPtr Conversion::createEquidistantConic( /** \brief Instantiate a conversion based on the [Eckert I] * (https://proj.org/operations/projections/eck1.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Eckert I] + * (https://proj.org/operations/projections/eck1.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -4726,6 +4842,7 @@ ConversionNNPtr Conversion::createEckertI(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4874,6 +4991,10 @@ ConversionNNPtr Conversion::createEckertI(const util::PropertyMap &properties, /** \brief Instantiate a conversion based on the [Eckert II] * (https://proj.org/operations/projections/eck2.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Eckert II] + * (https://proj.org/operations/projections/eck2.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -4900,6 +5021,7 @@ ConversionNNPtr Conversion::createEckertII( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5048,6 +5170,10 @@ ConversionNNPtr Conversion::createEckertII( /** \brief Instantiate a conversion based on the [Eckert III] * (https://proj.org/operations/projections/eck3.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Eckert III] + * (https://proj.org/operations/projections/eck3.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -5074,6 +5200,7 @@ ConversionNNPtr Conversion::createEckertIII( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5222,6 +5349,10 @@ ConversionNNPtr Conversion::createEckertIII( /** \brief Instantiate a conversion based on the [Eckert IV] * (https://proj.org/operations/projections/eck4.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Eckert IV] + * (https://proj.org/operations/projections/eck4.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -5248,6 +5379,7 @@ ConversionNNPtr Conversion::createEckertIV( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5396,6 +5528,10 @@ ConversionNNPtr Conversion::createEckertIV( /** \brief Instantiate a conversion based on the [Eckert V] * (https://proj.org/operations/projections/eck5.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Eckert V] + * (https://proj.org/operations/projections/eck5.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -5423,6 +5559,7 @@ ConversionNNPtr Conversion::createEckertV(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5571,6 +5708,10 @@ ConversionNNPtr Conversion::createEckertV(const util::PropertyMap &properties, /** \brief Instantiate a conversion based on the [Eckert VI] * (https://proj.org/operations/projections/eck6.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Eckert VI] + * (https://proj.org/operations/projections/eck6.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -5597,6 +5738,7 @@ ConversionNNPtr Conversion::createEckertVI( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5745,6 +5887,10 @@ ConversionNNPtr Conversion::createEckertVI( /** \brief Instantiate a conversion based on the [Equidistant Cylindrical] *(https://proj.org/operations/projections/eqc.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Equidistant Cylindrical] + *(https://proj.org/operations/projections/eqc.html) projection method. +>>>>>>> locationtech-main * * This is also known as the Equirectangular method, and in the particular case * where the latitude of first parallel is 0. @@ -5756,6 +5902,7 @@ ConversionNNPtr Conversion::createEckertVI( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5904,6 +6051,10 @@ ConversionNNPtr Conversion::createEckertVI( * This method is defined as [EPSG:1028] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1028) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1028] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1028) +>>>>>>> locationtech-main * * @note This is the equivalent OGRSpatialReference::SetEquirectangular2( * 0.0, latitudeFirstParallel, falseEasting, falseNorthing ) of GDAL <= 2.3, @@ -5936,6 +6087,7 @@ ConversionNNPtr Conversion::createEquidistantCylindrical( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6090,6 +6242,11 @@ ConversionNNPtr Conversion::createEquidistantCylindrical( *(Spherical)] *(https://proj.org/operations/projections/eqc.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Equidistant Cylindrical + *(Spherical)] + *(https://proj.org/operations/projections/eqc.html) projection method. +>>>>>>> locationtech-main * * This is also known as the Equirectangular method, and in the particular case * where the latitude of first parallel is 0. @@ -6101,6 +6258,7 @@ ConversionNNPtr Conversion::createEquidistantCylindrical( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6249,6 +6407,10 @@ ConversionNNPtr Conversion::createEquidistantCylindrical( * This method is defined as [EPSG:1029] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1029) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1029] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1029) +>>>>>>> locationtech-main * * @note This is the equivalent OGRSpatialReference::SetEquirectangular2( * 0.0, latitudeFirstParallel, falseEasting, falseNorthing ) of GDAL <= 2.3, @@ -6282,6 +6444,7 @@ ConversionNNPtr Conversion::createEquidistantCylindricalSpherical( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6430,6 +6593,10 @@ ConversionNNPtr Conversion::createEquidistantCylindricalSpherical( /** \brief Instantiate a conversion based on the [Gall (Stereographic)] * (https://proj.org/operations/projections/gall.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Gall (Stereographic)] + * (https://proj.org/operations/projections/gall.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -6457,6 +6624,7 @@ ConversionNNPtr Conversion::createGall(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6605,6 +6773,10 @@ ConversionNNPtr Conversion::createGall(const util::PropertyMap &properties, /** \brief Instantiate a conversion based on the [Goode Homolosine] * (https://proj.org/operations/projections/goode.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Goode Homolosine] + * (https://proj.org/operations/projections/goode.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -6631,6 +6803,7 @@ ConversionNNPtr Conversion::createGoodeHomolosine( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6779,6 +6952,10 @@ ConversionNNPtr Conversion::createGoodeHomolosine( /** \brief Instantiate a conversion based on the [Interrupted Goode Homolosine] * (https://proj.org/operations/projections/igh.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Interrupted Goode Homolosine] + * (https://proj.org/operations/projections/igh.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -6810,6 +6987,7 @@ ConversionNNPtr Conversion::createInterruptedGoodeHomolosine( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6958,6 +7136,10 @@ ConversionNNPtr Conversion::createInterruptedGoodeHomolosine( /** \brief Instantiate a conversion based on the [Geostationary Satellite View] * (https://proj.org/operations/projections/geos.html) projection method, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Geostationary Satellite View] + * (https://proj.org/operations/projections/geos.html) projection method, +>>>>>>> locationtech-main * with the sweep angle axis of the viewing instrument being x * * There is no equivalent in EPSG. @@ -6988,6 +7170,7 @@ ConversionNNPtr Conversion::createGeostationarySatelliteSweepX( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7136,6 +7319,10 @@ ConversionNNPtr Conversion::createGeostationarySatelliteSweepX( /** \brief Instantiate a conversion based on the [Geostationary Satellite View] * (https://proj.org/operations/projections/geos.html) projection method, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Geostationary Satellite View] + * (https://proj.org/operations/projections/geos.html) projection method, +>>>>>>> locationtech-main * with the sweep angle axis of the viewing instrument being y. * * There is no equivalent in EPSG. @@ -7166,6 +7353,7 @@ ConversionNNPtr Conversion::createGeostationarySatelliteSweepY( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7314,6 +7502,10 @@ ConversionNNPtr Conversion::createGeostationarySatelliteSweepY( /** \brief Instantiate a conversion based on the [Gnomonic] *(https://proj.org/operations/projections/gnom.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Gnomonic] + *(https://proj.org/operations/projections/gnom.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -7343,6 +7535,7 @@ ConversionNNPtr Conversion::createGnomonic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7497,6 +7690,11 @@ ConversionNNPtr Conversion::createGnomonic( *(Variant A)] *(https://proj.org/operations/projections/omerc.html) projection method >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Hotine Oblique Mercator + *(Variant A)] + *(https://proj.org/operations/projections/omerc.html) projection method +>>>>>>> locationtech-main * * This is the variant with the no_uoff parameter, which corresponds to * GDAL >=2.3 Hotine_Oblique_Mercator projection. @@ -7512,6 +7710,7 @@ ConversionNNPtr Conversion::createGnomonic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7588,6 +7787,8 @@ ConversionNNPtr Conversion::createGnomonic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * This method is defined as [EPSG:9812] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9812) * @@ -7601,6 +7802,7 @@ ConversionNNPtr Conversion::createGnomonic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -7716,6 +7918,8 @@ ConversionNNPtr Conversion::createGnomonic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -7753,6 +7957,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantA( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7907,6 +8112,11 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantA( *(Variant B)] *(https://proj.org/operations/projections/omerc.html) projection method >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Hotine Oblique Mercator + *(Variant B)] + *(https://proj.org/operations/projections/omerc.html) projection method +>>>>>>> locationtech-main * * This is the variant without the no_uoff parameter, which corresponds to * GDAL >=2.3 Hotine_Oblique_Mercator_Azimuth_Center projection. @@ -7920,6 +8130,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantA( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -7996,6 +8207,8 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantA( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * This method is defined as [EPSG:9815] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9815) * @@ -8009,6 +8222,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantA( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8124,6 +8338,8 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantA( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -8161,6 +8377,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantB( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -8315,6 +8532,11 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorVariantB( *Point Natural Origin] *(https://proj.org/operations/projections/omerc.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Hotine Oblique Mercator Two + *Point Natural Origin] + *(https://proj.org/operations/projections/omerc.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -8361,6 +8583,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorTwoPointNaturalOrigin( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -8436,6 +8659,8 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorTwoPointNaturalOrigin( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Laborde Oblique Mercator] *(https://proj.org/operations/projections/labrd.html) projection method. * @@ -8447,6 +8672,7 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorTwoPointNaturalOrigin( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8560,6 +8786,8 @@ ConversionNNPtr Conversion::createHotineObliqueMercatorTwoPointNaturalOrigin( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -8592,6 +8820,7 @@ ConversionNNPtr Conversion::createLabordeObliqueMercator( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -8746,6 +8975,11 @@ ConversionNNPtr Conversion::createLabordeObliqueMercator( *Polyconic] *(https://proj.org/operations/projections/imw_p.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [International Map of the World + *Polyconic] + *(https://proj.org/operations/projections/imw_p.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -8782,6 +9016,7 @@ ConversionNNPtr Conversion::createInternationalMapWorldPolyconic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -8857,6 +9092,8 @@ ConversionNNPtr Conversion::createInternationalMapWorldPolyconic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Krovak (north oriented)] *(https://proj.org/operations/projections/krovak.html) projection method. * @@ -8868,6 +9105,7 @@ ConversionNNPtr Conversion::createInternationalMapWorldPolyconic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8981,6 +9219,8 @@ ConversionNNPtr Conversion::createInternationalMapWorldPolyconic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * The coordinates are returned in the "GIS friendly" order: easting, northing. * This method is similar to createKrovak(), except that the later returns @@ -9033,6 +9273,7 @@ ConversionNNPtr Conversion::createKrovakNorthOriented( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -9108,6 +9349,8 @@ ConversionNNPtr Conversion::createKrovakNorthOriented( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Krovak] *(https://proj.org/operations/projections/krovak.html) projection method. * @@ -9119,6 +9362,7 @@ ConversionNNPtr Conversion::createKrovakNorthOriented( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -9232,6 +9476,8 @@ ConversionNNPtr Conversion::createKrovakNorthOriented( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * The coordinates are returned in the historical order: southing, westing * This method is similar to createKrovakNorthOriented(), except that the later @@ -9286,6 +9532,7 @@ Conversion::createKrovak(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -9361,6 +9608,8 @@ Conversion::createKrovak(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Lambert Azimuthal Equal Area] *(https://proj.org/operations/projections/laea.html) projection method. * @@ -9372,6 +9621,7 @@ Conversion::createKrovak(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -9485,6 +9735,8 @@ Conversion::createKrovak(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -9512,6 +9764,7 @@ ConversionNNPtr Conversion::createLambertAzimuthalEqualArea( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -9660,6 +9913,10 @@ ConversionNNPtr Conversion::createLambertAzimuthalEqualArea( /** \brief Instantiate a conversion based on the [Miller Cylindrical] *(https://proj.org/operations/projections/mill.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Miller Cylindrical] + *(https://proj.org/operations/projections/mill.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -9686,6 +9943,7 @@ ConversionNNPtr Conversion::createMillerCylindrical( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -9881,6 +10139,8 @@ ConversionNNPtr Conversion::createMillerCylindrical( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Mercator] *(https://proj.org/operations/projections/merc.html) projection method. * @@ -9892,6 +10152,7 @@ ConversionNNPtr Conversion::createMillerCylindrical( * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9804) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -9914,6 +10175,8 @@ ConversionNNPtr Conversion::createMillerCylindrical( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -9942,6 +10205,7 @@ ConversionNNPtr Conversion::createMercatorVariantA( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -10141,6 +10405,8 @@ ConversionNNPtr Conversion::createMercatorVariantA( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Mercator] *(https://proj.org/operations/projections/merc.html) projection method. * @@ -10152,6 +10418,7 @@ ConversionNNPtr Conversion::createMercatorVariantA( * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9805) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -10174,6 +10441,8 @@ ConversionNNPtr Conversion::createMercatorVariantA( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -10201,6 +10470,7 @@ ConversionNNPtr Conversion::createMercatorVariantB( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -10355,6 +10625,11 @@ ConversionNNPtr Conversion::createMercatorVariantB( *Mercator] *(https://proj.org/operations/projections/webmerc.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Popular Visualisation Pseudo + *Mercator] + *(https://proj.org/operations/projections/webmerc.html) projection method. +>>>>>>> locationtech-main * * Also known as WebMercator. Mostly/only used for Projected CRS EPSG:3857 * (WGS 84 / Pseudo-Mercator) @@ -10366,6 +10641,7 @@ ConversionNNPtr Conversion::createMercatorVariantB( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -10514,6 +10790,10 @@ ConversionNNPtr Conversion::createMercatorVariantB( * This method is defined as [EPSG:1024] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1024) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1024] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1024) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -10541,6 +10821,7 @@ ConversionNNPtr Conversion::createPopularVisualisationPseudoMercator( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -10689,6 +10970,10 @@ ConversionNNPtr Conversion::createPopularVisualisationPseudoMercator( /** \brief Instantiate a conversion based on the [Mollweide] * (https://proj.org/operations/projections/moll.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Mollweide] + * (https://proj.org/operations/projections/moll.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -10715,6 +11000,7 @@ ConversionNNPtr Conversion::createMollweide( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -10790,6 +11076,8 @@ ConversionNNPtr Conversion::createMollweide( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [New Zealand Map Grid] * (https://proj.org/operations/projections/nzmg.html) projection method. * @@ -10801,6 +11089,7 @@ ConversionNNPtr Conversion::createMollweide( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -10914,6 +11203,8 @@ ConversionNNPtr Conversion::createMollweide( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -10941,6 +11232,7 @@ ConversionNNPtr Conversion::createNewZealandMappingGrid( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -11016,6 +11308,8 @@ ConversionNNPtr Conversion::createNewZealandMappingGrid( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Oblique Stereographic *(Alternative)] *(https://proj.org/operations/projections/sterea.html) projection method. @@ -11028,6 +11322,7 @@ ConversionNNPtr Conversion::createNewZealandMappingGrid( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -11141,6 +11436,8 @@ ConversionNNPtr Conversion::createNewZealandMappingGrid( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -11169,6 +11466,7 @@ ConversionNNPtr Conversion::createObliqueStereographic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -11244,6 +11542,8 @@ ConversionNNPtr Conversion::createObliqueStereographic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Orthographic] *(https://proj.org/operations/projections/ortho.html) projection method. * @@ -11255,6 +11555,7 @@ ConversionNNPtr Conversion::createObliqueStereographic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -11368,6 +11669,8 @@ ConversionNNPtr Conversion::createObliqueStereographic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * \note Before PROJ 7.2, only the spherical formulation was implemented. * @@ -11397,6 +11700,7 @@ ConversionNNPtr Conversion::createOrthographic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -11472,6 +11776,8 @@ ConversionNNPtr Conversion::createOrthographic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [American Polyconic] *(https://proj.org/operations/projections/poly.html) projection method. * @@ -11483,6 +11789,7 @@ ConversionNNPtr Conversion::createOrthographic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -11596,6 +11903,8 @@ ConversionNNPtr Conversion::createOrthographic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -11623,6 +11932,7 @@ ConversionNNPtr Conversion::createAmericanPolyconic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -11698,6 +12008,8 @@ ConversionNNPtr Conversion::createAmericanPolyconic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Polar Stereographic (Variant *A)] *(https://proj.org/operations/projections/stere.html) projection method. @@ -11710,6 +12022,7 @@ ConversionNNPtr Conversion::createAmericanPolyconic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -11823,6 +12136,8 @@ ConversionNNPtr Conversion::createAmericanPolyconic( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * This is the variant of polar stereographic defined with a scale factor. * @@ -11853,6 +12168,7 @@ ConversionNNPtr Conversion::createPolarStereographicVariantA( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -11928,6 +12244,8 @@ ConversionNNPtr Conversion::createPolarStereographicVariantA( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Polar Stereographic (Variant *B)] *(https://proj.org/operations/projections/stere.html) projection method. @@ -11940,6 +12258,7 @@ ConversionNNPtr Conversion::createPolarStereographicVariantA( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -12053,6 +12372,8 @@ ConversionNNPtr Conversion::createPolarStereographicVariantA( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * This is the variant of polar stereographic defined with a latitude of * standard parallel. @@ -12084,6 +12405,7 @@ ConversionNNPtr Conversion::createPolarStereographicVariantB( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -12232,6 +12554,10 @@ ConversionNNPtr Conversion::createPolarStereographicVariantB( /** \brief Instantiate a conversion based on the [Robinson] * (https://proj.org/operations/projections/robin.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Robinson] + * (https://proj.org/operations/projections/robin.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -12258,6 +12584,7 @@ ConversionNNPtr Conversion::createRobinson( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -12406,6 +12733,10 @@ ConversionNNPtr Conversion::createRobinson( /** \brief Instantiate a conversion based on the [Sinusoidal] * (https://proj.org/operations/projections/sinu.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Sinusoidal] + * (https://proj.org/operations/projections/sinu.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -12432,6 +12763,7 @@ ConversionNNPtr Conversion::createSinusoidal( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -12580,6 +12912,10 @@ ConversionNNPtr Conversion::createSinusoidal( /** \brief Instantiate a conversion based on the [Stereographic] *(https://proj.org/operations/projections/stere.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Stereographic] + *(https://proj.org/operations/projections/stere.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. This method implements the original "Oblique * Stereographic" method described in "Snyder's Map Projections - A Working @@ -12591,6 +12927,7 @@ ConversionNNPtr Conversion::createSinusoidal( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -12713,6 +13050,9 @@ ConversionNNPtr Conversion::createSinusoidal( ======= * which is different from the "Oblique Stereographic (alternative") method >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * which is different from the "Oblique Stereographic (alternative") method +>>>>>>> locationtech-main * implemented in createObliqueStereographic(). * * @param properties See \ref general_properties of the conversion. If the name @@ -12742,6 +13082,7 @@ ConversionNNPtr Conversion::createStereographic( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -12890,6 +13231,10 @@ ConversionNNPtr Conversion::createStereographic( /** \brief Instantiate a conversion based on the [Van der Grinten] * (https://proj.org/operations/projections/vandg.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Van der Grinten] + * (https://proj.org/operations/projections/vandg.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -12916,6 +13261,7 @@ ConversionNNPtr Conversion::createVanDerGrinten( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -13064,6 +13410,10 @@ ConversionNNPtr Conversion::createVanDerGrinten( /** \brief Instantiate a conversion based on the [Wagner I] * (https://proj.org/operations/projections/wag1.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Wagner I] + * (https://proj.org/operations/projections/wag1.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -13091,6 +13441,7 @@ ConversionNNPtr Conversion::createWagnerI(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -13239,6 +13590,10 @@ ConversionNNPtr Conversion::createWagnerI(const util::PropertyMap &properties, /** \brief Instantiate a conversion based on the [Wagner II] * (https://proj.org/operations/projections/wag2.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Wagner II] + * (https://proj.org/operations/projections/wag2.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -13265,6 +13620,7 @@ ConversionNNPtr Conversion::createWagnerII( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -13413,6 +13769,10 @@ ConversionNNPtr Conversion::createWagnerII( /** \brief Instantiate a conversion based on the [Wagner III] * (https://proj.org/operations/projections/wag3.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Wagner III] + * (https://proj.org/operations/projections/wag3.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -13442,6 +13802,7 @@ ConversionNNPtr Conversion::createWagnerIII( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -13590,6 +13951,10 @@ ConversionNNPtr Conversion::createWagnerIII( /** \brief Instantiate a conversion based on the [Wagner IV] * (https://proj.org/operations/projections/wag4.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Wagner IV] + * (https://proj.org/operations/projections/wag4.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -13616,6 +13981,7 @@ ConversionNNPtr Conversion::createWagnerIV( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -13764,6 +14130,10 @@ ConversionNNPtr Conversion::createWagnerIV( /** \brief Instantiate a conversion based on the [Wagner V] * (https://proj.org/operations/projections/wag5.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Wagner V] + * (https://proj.org/operations/projections/wag5.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -13791,6 +14161,7 @@ ConversionNNPtr Conversion::createWagnerV(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -13939,6 +14310,10 @@ ConversionNNPtr Conversion::createWagnerV(const util::PropertyMap &properties, /** \brief Instantiate a conversion based on the [Wagner VI] * (https://proj.org/operations/projections/wag6.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Wagner VI] + * (https://proj.org/operations/projections/wag6.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -13965,6 +14340,7 @@ ConversionNNPtr Conversion::createWagnerVI( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -14113,6 +14489,10 @@ ConversionNNPtr Conversion::createWagnerVI( /** \brief Instantiate a conversion based on the [Wagner VII] * (https://proj.org/operations/projections/wag7.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Wagner VII] + * (https://proj.org/operations/projections/wag7.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -14139,6 +14519,7 @@ ConversionNNPtr Conversion::createWagnerVII( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -14293,6 +14674,11 @@ ConversionNNPtr Conversion::createWagnerVII( *Cube] *(https://proj.org/operations/projections/qsc.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Quadrilateralized Spherical + *Cube] + *(https://proj.org/operations/projections/qsc.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -14322,6 +14708,7 @@ ConversionNNPtr Conversion::createQuadrilateralizedSphericalCube( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -14470,6 +14857,10 @@ ConversionNNPtr Conversion::createQuadrilateralizedSphericalCube( /** \brief Instantiate a conversion based on the [Spherical Cross-Track Height] *(https://proj.org/operations/projections/sch.html) projection method. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Instantiate a conversion based on the [Spherical Cross-Track Height] + *(https://proj.org/operations/projections/sch.html) projection method. +>>>>>>> locationtech-main * * There is no equivalent in EPSG. * @@ -14500,6 +14891,7 @@ ConversionNNPtr Conversion::createSphericalCrossTrackHeight( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -14575,6 +14967,8 @@ ConversionNNPtr Conversion::createSphericalCrossTrackHeight( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Equal Earth] * (https://proj.org/operations/projections/eqearth.html) projection method. * @@ -14586,6 +14980,7 @@ ConversionNNPtr Conversion::createSphericalCrossTrackHeight( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -14699,6 +15094,8 @@ ConversionNNPtr Conversion::createSphericalCrossTrackHeight( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -14723,6 +15120,7 @@ ConversionNNPtr Conversion::createEqualEarth( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -14798,6 +15196,8 @@ ConversionNNPtr Conversion::createEqualEarth( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Instantiate a conversion based on the [Vertical Perspective] * (https://proj.org/operations/projections/nsper.html) projection method. * @@ -14809,6 +15209,7 @@ ConversionNNPtr Conversion::createEqualEarth( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -14922,6 +15323,8 @@ ConversionNNPtr Conversion::createEqualEarth( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * The PROJ implementation of the EPSG Vertical Perspective has the current * limitations with respect to the method described in EPSG: @@ -15070,6 +15473,7 @@ ConversionNNPtr Conversion::createPoleRotationNetCDFCFConvention( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -15218,6 +15622,10 @@ ConversionNNPtr Conversion::createPoleRotationNetCDFCFConvention( * This method is defined as [EPSG:1069] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1069) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1069] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1069) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -15251,6 +15659,7 @@ Conversion::createChangeVerticalUnit(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -15399,6 +15808,10 @@ Conversion::createChangeVerticalUnit(const util::PropertyMap &properties, * This method is defined as [EPSG:1104] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1104) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1104] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1104) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -15424,6 +15837,7 @@ Conversion::createChangeVerticalUnit(const util::PropertyMap &properties) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -15572,6 +15986,10 @@ Conversion::createChangeVerticalUnit(const util::PropertyMap &properties) { * This method is defined as [EPSG:1068] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1068) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1068] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1068) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -15599,6 +16017,7 @@ Conversion::createHeightDepthReversal(const util::PropertyMap &properties) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15688,6 +16107,8 @@ Conversion::createHeightDepthReversal(const util::PropertyMap &properties) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * This method is defined as [EPSG:9843] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9843), * or for 3D as [EPSG:9844] @@ -15698,6 +16119,7 @@ Conversion::createHeightDepthReversal(const util::PropertyMap &properties) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -15794,6 +16216,8 @@ Conversion::createHeightDepthReversal(const util::PropertyMap &properties) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * * @param is3D Whether this should apply on 3D geographicCRS * @return a new Conversion. @@ -15822,6 +16246,7 @@ ConversionNNPtr Conversion::createAxisOrderReversal(bool is3D) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -15970,6 +16395,10 @@ ConversionNNPtr Conversion::createAxisOrderReversal(bool is3D) { * This method is defined as [EPSG:9602] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9602), >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9602] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9602), +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. @@ -17388,6 +17817,7 @@ void Conversion::_exportToPROJString( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17510,6 +17940,9 @@ void Conversion::_exportToPROJString( ======= double southPoleLon = parameterValueNumeric( >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double southPoleLon = parameterValueNumeric( +>>>>>>> locationtech-main PROJ_WKT2_NAME_PARAMETER_SOUTH_POLE_LONGITUDE_GRIB_CONVENTION, common::UnitOfMeasure::DEGREE); double rotation = parameterValueNumeric( @@ -17526,6 +17959,7 @@ void Conversion::_exportToPROJString( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17648,6 +18082,9 @@ void Conversion::_exportToPROJString( ======= formatter->addParam("lon_0", southPoleLon); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + formatter->addParam("lon_0", southPoleLon); +>>>>>>> locationtech-main bConversionDone = true; } else if (ci_equal( methodName, @@ -17803,6 +18240,7 @@ void Conversion::_exportToPROJString( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -17925,6 +18363,9 @@ void Conversion::_exportToPROJString( ======= const auto lonOrigin = parameterValueNumeric( >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const auto lonOrigin = parameterValueNumeric( +>>>>>>> locationtech-main EPSG_CODE_PARAMETER_LONGITUDE_TOPOGRAPHIC_ORIGIN, common::UnitOfMeasure::DEGREE); const auto heightOrigin = parameterValueNumeric( @@ -17938,6 +18379,7 @@ void Conversion::_exportToPROJString( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -18060,6 +18502,9 @@ void Conversion::_exportToPROJString( ======= formatter->addParam("lon_0", lonOrigin); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + formatter->addParam("lon_0", lonOrigin); +>>>>>>> locationtech-main formatter->addParam("h_0", heightOrigin); bConversionDone = true; } @@ -18101,6 +18546,7 @@ void Conversion::_exportToPROJString( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -18213,6 +18659,8 @@ void Conversion::_exportToPROJString( ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // No need to add explicit f=0 or R_A if the ellipsoid is a // sphere @@ -18223,6 +18671,7 @@ void Conversion::_exportToPROJString( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -18479,6 +18928,8 @@ void Conversion::_exportToPROJString( // No need to add explicit f=0 if the ellipsoid is a sphere if (strcmp(mapping->proj_name_aux, "f=0") == 0) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main crs::CRS *horiz = l_sourceCRS.get(); const auto compound = dynamic_cast(horiz); @@ -18647,6 +19098,7 @@ void Conversion::_exportToPROJString( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -18795,6 +19247,10 @@ void Conversion::_exportToPROJString( /** \brief Return whether a conversion is a [Universal Transverse Mercator] * (https://proj.org/operations/projections/utm.html) conversion. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +/** \brief Return whether a conversion is a [Universal Transverse Mercator] + * (https://proj.org/operations/projections/utm.html) conversion. +>>>>>>> locationtech-main * * @param[out] zone UTM zone number between 1 and 60. * @param[out] north true for UTM northern hemisphere, false for UTM southern @@ -18914,6 +19370,7 @@ ConversionNNPtr Conversion::identify() const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19006,6 +19463,8 @@ ConversionNNPtr Conversion::identify() const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * This method is defined as [EPSG:9619] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9619) * * @@ -19019,6 +19478,7 @@ ConversionNNPtr Conversion::identify() const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -19126,6 +19586,8 @@ ConversionNNPtr Conversion::identify() const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * @return new conversion. */ ConversionNNPtr @@ -19138,6 +19600,7 @@ Conversion::createGeographic2DOffsets(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19260,6 +19723,9 @@ Conversion::createGeographic2DOffsets(const util::PropertyMap &properties, ======= const common::Angle &offsetLon) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon) { +>>>>>>> locationtech-main return create( properties, createMethodMapNameEPSGCode(EPSG_CODE_METHOD_GEOGRAPHIC2D_OFFSETS), @@ -19273,6 +19739,7 @@ Conversion::createGeographic2DOffsets(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19395,6 +19862,9 @@ Conversion::createGeographic2DOffsets(const util::PropertyMap &properties, ======= VectorOfValues{offsetLat, offsetLon}); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + VectorOfValues{offsetLat, offsetLon}); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -19408,6 +19878,7 @@ Conversion::createGeographic2DOffsets(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19500,6 +19971,8 @@ Conversion::createGeographic2DOffsets(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * This method is defined as [EPSG:9660] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9660) * * @@ -19513,6 +19986,7 @@ Conversion::createGeographic2DOffsets(const util::PropertyMap &properties, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -19620,6 +20094,8 @@ Conversion::createGeographic2DOffsets(const util::PropertyMap &properties, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * @param offsetHeight Height offset to add. * @return new Conversion. */ @@ -19632,6 +20108,7 @@ ConversionNNPtr Conversion::createGeographic3DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19754,6 +20231,9 @@ ConversionNNPtr Conversion::createGeographic3DOffsets( ======= const common::Angle &offsetLon, const common::Length &offsetHeight) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon, const common::Length &offsetHeight) { +>>>>>>> locationtech-main return create( properties, createMethodMapNameEPSGCode(EPSG_CODE_METHOD_GEOGRAPHIC3D_OFFSETS), @@ -19768,6 +20248,7 @@ ConversionNNPtr Conversion::createGeographic3DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19890,6 +20371,9 @@ ConversionNNPtr Conversion::createGeographic3DOffsets( ======= VectorOfValues{offsetLat, offsetLon, offsetHeight}); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + VectorOfValues{offsetLat, offsetLon, offsetHeight}); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -19905,6 +20389,7 @@ ConversionNNPtr Conversion::createGeographic3DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19997,6 +20482,8 @@ ConversionNNPtr Conversion::createGeographic3DOffsets( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * This method is defined as [EPSG:9618] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9618) * * @@ -20010,6 +20497,7 @@ ConversionNNPtr Conversion::createGeographic3DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -20117,6 +20605,8 @@ ConversionNNPtr Conversion::createGeographic3DOffsets( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main * @param offsetHeight Geoid undulation to add. * @return new Conversion. */ @@ -20129,6 +20619,7 @@ ConversionNNPtr Conversion::createGeographic2DWithHeightOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -20251,6 +20742,9 @@ ConversionNNPtr Conversion::createGeographic2DWithHeightOffsets( ======= const common::Angle &offsetLon, const common::Length &offsetHeight) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon, const common::Length &offsetHeight) { +>>>>>>> locationtech-main return create( properties, createMethodMapNameEPSGCode( @@ -20266,6 +20760,7 @@ ConversionNNPtr Conversion::createGeographic2DWithHeightOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -20388,6 +20883,9 @@ ConversionNNPtr Conversion::createGeographic2DWithHeightOffsets( ======= VectorOfValues{offsetLat, offsetLon, offsetHeight}); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + VectorOfValues{offsetLat, offsetLon, offsetHeight}); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -20401,6 +20899,7 @@ ConversionNNPtr Conversion::createGeographic2DWithHeightOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -20577,6 +21076,11 @@ ConversionNNPtr Conversion::createGeographic2DWithHeightOffsets( * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9616) * * >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9616] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9616) + * * +>>>>>>> locationtech-main * @param properties See \ref general_properties of the Conversion. * At minimum the name should be defined. * @param offsetHeight Geoid undulation to add. diff --git a/src/iso19111/operation/coordinateoperation_private.hpp b/src/iso19111/operation/coordinateoperation_private.hpp index af514c318ff9..d932accf7319 100644 --- a/src/iso19111/operation/coordinateoperation_private.hpp +++ b/src/iso19111/operation/coordinateoperation_private.hpp @@ -54,6 +54,7 @@ struct CoordinateOperation::Private { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -212,6 +213,10 @@ struct CoordinateOperation::Private { util::optional sourceCoordinateEpoch_{}; util::optional targetCoordinateEpoch_{}; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + util::optional sourceCoordinateEpoch_{}; + util::optional targetCoordinateEpoch_{}; +>>>>>>> locationtech-main bool hasBallparkTransformation_ = false; // do not set this for a ProjectedCRS.definingConversion diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp index 65cb27cfc26a..d7d44b252e07 100644 --- a/src/iso19111/operation/coordinateoperationfactory.cpp +++ b/src/iso19111/operation/coordinateoperationfactory.cpp @@ -39,6 +39,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #include "proj/coordinates.hpp" ======= <<<<<<< HEAD @@ -143,6 +144,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #include "proj/crs.hpp" #include "proj/io.hpp" #include "proj/metadata.hpp" @@ -285,6 +288,7 @@ struct CoordinateOperationContext::Private { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -418,6 +422,8 @@ struct CoordinateOperationContext::Private { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; //! @endcond @@ -441,6 +447,7 @@ CoordinateOperationContext::CoordinateOperationContext() <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -573,6 +580,8 @@ CoordinateOperationContext::CoordinateOperationContext( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Return the authority factory, or null */ const io::AuthorityFactoryPtr & CoordinateOperationContext::getAuthorityFactory() const { @@ -826,6 +835,7 @@ CoordinateOperationContext::getIntermediateCRS() const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -992,6 +1002,8 @@ CoordinateOperationContext::getTargetCoordinateEpoch() const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /** \brief Creates a context for a coordinate operation. * * If a non null authorityFactory is provided, the resulting context should @@ -1034,6 +1046,7 @@ CoordinateOperationContextNNPtr CoordinateOperationContext::create( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1173,6 +1186,8 @@ CoordinateOperationContextNNPtr CoordinateOperationContext::clone() const { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main //! @cond Doxygen_Suppress struct CoordinateOperationFactory::Private { @@ -4765,6 +4780,7 @@ void CoordinateOperationFactory::Private::createOperationsGeodToGeod( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4959,6 +4975,11 @@ void CoordinateOperationFactory::Private::createOperationsGeodToGeod( "Source and target ellipsoid do not belong to the same " "celestial body"); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + throw util::UnsupportedOperationException( + "Source and target ellipsoid do not belong to the same " + "celestial body"); +>>>>>>> locationtech-main } auto geogSrc = dynamic_cast(geodSrc); @@ -6836,6 +6857,7 @@ void CoordinateOperationFactory::Private::createOperationsCompoundToCompound( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6958,6 +6980,9 @@ void CoordinateOperationFactory::Private::createOperationsCompoundToCompound( ======= // Symetrical situation with the promoted-to-3D target geographic CRS >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // Symetrical situation with the promoted-to-3D target geographic CRS +>>>>>>> locationtech-main else if (!dstGeog->identifiers().empty() && intermGeogDst->identifiers().empty() && !intermGeogSrc->identifiers().empty() && @@ -7273,6 +7298,7 @@ CoordinateOperationFactory::createOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7420,6 +7446,8 @@ CoordinateOperationFactory::createOperations( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return filterAndSort(Private::createOperations(l_resolvedSourceCRS, l_resolvedTargetCRS, contextPrivate), @@ -7430,6 +7458,7 @@ CoordinateOperationFactory::createOperations( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -7526,6 +7555,8 @@ CoordinateOperationFactory::createOperations( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- diff --git a/src/iso19111/operation/parammappings.cpp b/src/iso19111/operation/parammappings.cpp index 9afb6e85bb3d..2d3b1a1c0c17 100644 --- a/src/iso19111/operation/parammappings.cpp +++ b/src/iso19111/operation/parammappings.cpp @@ -214,6 +214,7 @@ static const ParamMapping paramLatNatLatCenter = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -336,6 +337,9 @@ static const ParamMapping paramLonNatLonCenter = { ======= static const ParamMapping paramLonNatLonCenter = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramLonNatLonCenter = { +>>>>>>> locationtech-main EPSG_NAME_PARAMETER_LONGITUDE_OF_NATURAL_ORIGIN, EPSG_CODE_PARAMETER_LONGITUDE_OF_NATURAL_ORIGIN, WKT1_LONGITUDE_OF_CENTER, common::UnitOfMeasure::Type::ANGULAR, lon_0}; @@ -348,6 +352,7 @@ static const ParamMapping *const paramsAEQD[]{ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -470,6 +475,9 @@ static const ParamMapping *const paramsAEQD[]{ ======= ¶mLatNatLatCenter, ¶mLonNatLonCenter, ¶mFalseEasting, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mLatNatLatCenter, ¶mLonNatLonCenter, ¶mFalseEasting, +>>>>>>> locationtech-main ¶mFalseNorthing, nullptr}; static const ParamMapping *const paramsNatOrigin[] = { @@ -502,6 +510,7 @@ static const ParamMapping *const paramsEQDC[] = {¶mLatNatLatCenter, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -624,6 +633,9 @@ static const ParamMapping *const paramsEQDC[] = {¶mLatNatLatCenter, ======= ¶mLonNatLonCenter, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mLonNatLonCenter, +>>>>>>> locationtech-main ¶mLatitude1stStdParallel, ¶mLatitude2ndStdParallel, ¶mFalseEasting, @@ -637,6 +649,7 @@ static const ParamMapping *const paramsEQDC[] = {¶mLatNatLatCenter, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -759,6 +772,9 @@ static const ParamMapping *const paramsLonNatOrigin[] = { ======= static const ParamMapping *const paramsLonNatOrigin[] = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping *const paramsLonNatOrigin[] = { +>>>>>>> locationtech-main ¶mLongitudeNatOrigin, ¶mFalseEasting, ¶mFalseNorthing, nullptr}; static const ParamMapping *const paramsEqc[] = { @@ -840,6 +856,7 @@ static const ParamMapping paramLatPoint1 = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -962,6 +979,9 @@ static const ParamMapping paramLonPoint1 = { ======= static const ParamMapping paramLonPoint1 = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramLonPoint1 = { +>>>>>>> locationtech-main "Longitude of 1st point", 0, "longitude_of_point_1", common::UnitOfMeasure::Type::ANGULAR, lon_1}; @@ -976,6 +996,7 @@ static const ParamMapping paramLatPoint2 = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1098,6 +1119,9 @@ static const ParamMapping paramLonPoint2 = { ======= static const ParamMapping paramLonPoint2 = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramLonPoint2 = { +>>>>>>> locationtech-main "Longitude of 2nd point", 0, "longitude_of_point_2", common::UnitOfMeasure::Type::ANGULAR, lon_2}; @@ -1111,6 +1135,7 @@ static const ParamMapping *const paramsHomTwoPoint[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1265,6 +1290,11 @@ static const ParamMapping *const paramsHomTwoPoint[] = { ¶mLatPoint2, ¶mLonPoint2, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mLonPoint1, + ¶mLatPoint2, + ¶mLonPoint2, +>>>>>>> locationtech-main ¶mScaleFactorInitialLine, ¶mFalseEastingProjectionCentre, ¶mFalseNorthingProjectionCentre, @@ -1281,6 +1311,7 @@ static const ParamMapping *const paramsIMWP[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1403,6 +1434,9 @@ static const ParamMapping paramLonCentreLonCenter = { ======= static const ParamMapping paramLonCentreLonCenter = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramLonCentreLonCenter = { +>>>>>>> locationtech-main EPSG_NAME_PARAMETER_LONGITUDE_OF_ORIGIN, EPSG_CODE_PARAMETER_LONGITUDE_OF_ORIGIN, WKT1_LONGITUDE_OF_CENTER, common::UnitOfMeasure::Type::ANGULAR, lon_0}; @@ -1434,6 +1468,7 @@ static const ParamMapping *const krovakParameters[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1556,6 +1591,9 @@ static const ParamMapping *const krovakParameters[] = { ======= ¶mLonCentreLonCenter, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mLonCentreLonCenter, +>>>>>>> locationtech-main ¶mColatitudeConeAxis, ¶mLatitudePseudoStdParallel, ¶mScaleFactorPseudoStdParallel, @@ -1571,6 +1609,7 @@ static const ParamMapping *const paramsLaea[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1644,6 +1683,8 @@ static const ParamMapping *const paramsMiller[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main ¶mLatNatLatCenter, ¶mLonNatLonCenter, ¶mFalseEasting, ¶mFalseNorthing, nullptr}; @@ -1655,6 +1696,7 @@ static const ParamMapping *const paramsMiller[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1764,6 +1806,8 @@ static const ParamMapping *const paramsMiller[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main static const ParamMapping paramLatMerc1SP = { EPSG_NAME_PARAMETER_LATITUDE_OF_NATURAL_ORIGIN, @@ -1796,6 +1840,7 @@ static const ParamMapping paramLatStdParallel = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1918,6 +1963,9 @@ static const ParamMapping paramsLonOrigin = { ======= static const ParamMapping paramsLonOrigin = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramsLonOrigin = { +>>>>>>> locationtech-main EPSG_NAME_PARAMETER_LONGITUDE_OF_ORIGIN, EPSG_CODE_PARAMETER_LONGITUDE_OF_ORIGIN, WKT1_CENTRAL_MERIDIAN, common::UnitOfMeasure::Type::ANGULAR, lon_0}; @@ -1930,6 +1978,7 @@ static const ParamMapping *const paramsPolarStereo[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2003,6 +2052,8 @@ static const ParamMapping *const paramsLongNatOriginLongitudeCentre[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main ¶mLatStdParallel, ¶msLonOrigin, ¶mFalseEasting, ¶mFalseNorthing, nullptr}; @@ -2014,6 +2065,7 @@ static const ParamMapping *const paramsLonNatOriginLongitudeCentre[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2123,6 +2175,8 @@ static const ParamMapping *const paramsLongNatOriginLongitudeCentre[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main static const ParamMapping paramLatTrueScaleWag3 = { "Latitude of true scale", 0, WKT1_LATITUDE_OF_ORIGIN, @@ -2143,6 +2197,7 @@ static const ParamMapping paramPegLat = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2265,6 +2320,9 @@ static const ParamMapping paramPegLon = { ======= static const ParamMapping paramPegLon = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramPegLon = { +>>>>>>> locationtech-main "Peg point longitude", 0, "peg_point_longitude", common::UnitOfMeasure::Type::ANGULAR, "plon_0"}; @@ -2284,6 +2342,7 @@ static const ParamMapping *const paramsSch[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2406,6 +2465,9 @@ static const ParamMapping *const paramsSch[] = { ======= ¶mPegLat, ¶mPegLon, ¶mPegHeading, ¶mPegHeight, nullptr}; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mPegLat, ¶mPegLon, ¶mPegHeading, ¶mPegHeight, nullptr}; +>>>>>>> locationtech-main static const ParamMapping *const paramsWink1[] = { ¶mLongitudeNatOrigin, ¶mLat1stParallelLatTs, ¶mFalseEasting, @@ -2431,6 +2493,7 @@ static const ParamMapping *const paramsLoxim[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2553,6 +2616,9 @@ static const ParamMapping paramLonCentre = { ======= static const ParamMapping paramLonCentre = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramLonCentre = { +>>>>>>> locationtech-main EPSG_NAME_PARAMETER_LONGITUDE_PROJECTION_CENTRE, EPSG_CODE_PARAMETER_LONGITUDE_PROJECTION_CENTRE, WKT1_LONGITUDE_OF_CENTER, common::UnitOfMeasure::Type::ANGULAR, lon_0}; @@ -2571,6 +2637,7 @@ static const ParamMapping *const paramsLabordeObliqueMercator[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2693,6 +2760,9 @@ static const ParamMapping *const paramsLabordeObliqueMercator[] = { ======= ¶mLonCentre, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mLonCentre, +>>>>>>> locationtech-main ¶mLabordeObliqueMercatorAzimuth, ¶mScaleFactorInitialLine, ¶mFalseEasting, @@ -2711,6 +2781,7 @@ static const ParamMapping paramLatTopoOrigin = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2833,6 +2904,9 @@ static const ParamMapping paramLonTopoOrigin = { ======= static const ParamMapping paramLonTopoOrigin = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramLonTopoOrigin = { +>>>>>>> locationtech-main EPSG_NAME_PARAMETER_LONGITUDE_TOPOGRAPHIC_ORIGIN, EPSG_CODE_PARAMETER_LONGITUDE_TOPOGRAPHIC_ORIGIN, nullptr, common::UnitOfMeasure::Type::ANGULAR, lon_0}; @@ -2856,6 +2930,7 @@ static const ParamMapping *const paramsVerticalPerspective[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2978,6 +3053,9 @@ static const ParamMapping *const paramsVerticalPerspective[] = { ======= ¶mLonTopoOrigin, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mLonTopoOrigin, +>>>>>>> locationtech-main ¶mHeightTopoOrigin, // unsupported by PROJ right now ¶mViewpointHeight, ¶mFalseEasting, // PROJ addition @@ -3029,6 +3107,7 @@ static const ParamMapping *const paramsGeographicTopocentric[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3151,6 +3230,9 @@ static const ParamMapping *const paramsGeographicTopocentric[] = { ======= ¶mLatTopoOrigin, ¶mLonTopoOrigin, ¶mHeightTopoOriginWithH0, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mLatTopoOrigin, ¶mLonTopoOrigin, ¶mHeightTopoOriginWithH0, +>>>>>>> locationtech-main nullptr}; static const MethodMapping projectionMethodMappings[] = { @@ -3176,6 +3258,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3308,6 +3391,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main {EPSG_NAME_METHOD_TUNISIA_MAPPING_GRID, EPSG_CODE_METHOD_TUNISIA_MAPPING_GRID, "Tunisia_Mapping_Grid", nullptr, nullptr, // no proj equivalent @@ -3370,6 +3455,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) nullptr, paramsLongNatOrigin}, @@ -3686,6 +3772,10 @@ static const MethodMapping projectionMethodMappings[] = { ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + nullptr, paramsLonNatOrigin}, + +>>>>>>> locationtech-main {EPSG_NAME_METHOD_LAMBERT_CYLINDRICAL_EQUAL_AREA, EPSG_CODE_METHOD_LAMBERT_CYLINDRICAL_EQUAL_AREA, "Cylindrical_Equal_Area", "cea", nullptr, paramsCEA}, @@ -3698,6 +3788,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3810,6 +3901,8 @@ static const MethodMapping projectionMethodMappings[] = { ======= >>>>>>> efa88b5285 (Merge pull request #3523 from rouault/cleanup_aeqd_s_forward) >>>>>>> 57d7b62058 (Merge pull request #3523 from rouault/cleanup_aeqd_s_forward) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main {EPSG_NAME_METHOD_LAMBERT_CYLINDRICAL_EQUAL_AREA_SPHERICAL, EPSG_CODE_METHOD_LAMBERT_CYLINDRICAL_EQUAL_AREA_SPHERICAL, @@ -3820,6 +3913,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4048,6 +4142,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main {EPSG_NAME_METHOD_CASSINI_SOLDNER, EPSG_CODE_METHOD_CASSINI_SOLDNER, "Cassini_Soldner", "cass", nullptr, paramsNatOrigin}, @@ -4066,6 +4162,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4270,6 +4367,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main paramsLonNatOrigin}, {PROJ_WKT2_NAME_METHOD_ECKERT_II, 0, "Eckert_II", "eck2", nullptr, @@ -4288,6 +4387,7 @@ static const MethodMapping projectionMethodMappings[] = { paramsLonNatOrigin}, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -4310,6 +4410,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main {EPSG_NAME_METHOD_EQUIDISTANT_CYLINDRICAL, EPSG_CODE_METHOD_EQUIDISTANT_CYLINDRICAL, "Equirectangular", "eqc", @@ -4327,6 +4429,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4519,6 +4622,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "mbtfpq", nullptr, paramsLonNatOrigin}, {PROJ_WKT2_NAME_METHOD_GALL_STEREOGRAPHIC, 0, "Gall_Stereographic", "gall", @@ -4534,6 +4639,7 @@ static const MethodMapping projectionMethodMappings[] = { "igh_o", nullptr, paramsLonNatOrigin}, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -4556,6 +4662,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main // No proper WKT1 representation fr sweep=x {PROJ_WKT2_NAME_METHOD_GEOSTATIONARY_SATELLITE_SWEEP_X, 0, nullptr, "geos", @@ -4608,6 +4716,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4894,6 +5003,9 @@ static const MethodMapping projectionMethodMappings[] = { ======= "Lambert_Azimuthal_Equal_Area", "laea", nullptr, paramsLaea}, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "Lambert_Azimuthal_Equal_Area", "laea", "R_A", paramsLaea}, +>>>>>>> locationtech-main {PROJ_WKT2_NAME_METHOD_MILLER_CYLINDRICAL, 0, "Miller_Cylindrical", "mill", "R_A", paramsMiller}, @@ -4918,6 +5030,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5086,6 +5199,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main paramsLonNatOrigin}, {PROJ_WKT2_NAME_METHOD_NATURAL_EARTH, 0, "Natural_Earth", "natearth", @@ -5095,6 +5210,7 @@ static const MethodMapping projectionMethodMappings[] = { nullptr, paramsLonNatOrigin}, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -5117,6 +5233,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main {EPSG_NAME_METHOD_NZMG, EPSG_CODE_METHOD_NZMG, "New_Zealand_Map_Grid", "nzmg", nullptr, paramsNatOrigin}, @@ -5144,6 +5262,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5266,6 +5385,9 @@ static const MethodMapping projectionMethodMappings[] = { ======= paramsLonNatOrigin}, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + paramsLonNatOrigin}, +>>>>>>> locationtech-main {EPSG_NAME_METHOD_AMERICAN_POLYCONIC, EPSG_CODE_METHOD_AMERICAN_POLYCONIC, "Polyconic", "poly", nullptr, paramsNatOrigin}, @@ -5286,6 +5408,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5408,6 +5531,9 @@ static const MethodMapping projectionMethodMappings[] = { ======= paramsLonNatOriginLongitudeCentre}, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + paramsLonNatOriginLongitudeCentre}, +>>>>>>> locationtech-main {PROJ_WKT2_NAME_METHOD_PEIRCE_QUINCUNCIAL_SQUARE, 0, nullptr, "peirce_q", "shape=square", paramsNatOriginScale}, @@ -5423,6 +5549,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5545,6 +5672,9 @@ static const MethodMapping projectionMethodMappings[] = { ======= paramsLonNatOriginLongitudeCentre}, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + paramsLonNatOriginLongitudeCentre}, +>>>>>>> locationtech-main {PROJ_WKT2_NAME_METHOD_STEREOGRAPHIC, 0, "Stereographic", "stere", nullptr, paramsObliqueStereo}, @@ -5557,6 +5687,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5737,6 +5868,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main paramsLonNatOrigin}, {PROJ_WKT2_NAME_METHOD_VAN_DER_GRINTEN, 0, "VanDerGrinten", "vandg", "R_A", @@ -5749,6 +5882,7 @@ static const MethodMapping projectionMethodMappings[] = { paramsLonNatOrigin}, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -5771,6 +5905,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main {PROJ_WKT2_NAME_METHOD_WAGNER_III, 0, "Wagner_III", "wag3", nullptr, paramsWag3}, @@ -5783,6 +5919,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5963,6 +6100,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main paramsLonNatOrigin}, {PROJ_WKT2_NAME_METHOD_WAGNER_V, 0, "Wagner_V", "wag5", nullptr, @@ -5975,6 +6114,7 @@ static const MethodMapping projectionMethodMappings[] = { paramsLonNatOrigin}, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -5997,6 +6137,8 @@ static const MethodMapping projectionMethodMappings[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main {PROJ_WKT2_NAME_METHOD_QUADRILATERALIZED_SPHERICAL_CUBE, 0, "Quadrilateralized_Spherical_Cube", "qsc", nullptr, paramsNatOrigin}, @@ -6014,6 +6156,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6136,6 +6279,9 @@ static const MethodMapping projectionMethodMappings[] = { ======= {"Aitoff", 0, "Aitoff", "aitoff", nullptr, paramsLonNatOrigin}, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + {"Aitoff", 0, "Aitoff", "aitoff", nullptr, paramsLonNatOrigin}, +>>>>>>> locationtech-main {"Winkel I", 0, "Winkel_I", "wink1", nullptr, paramsWink1}, @@ -6150,6 +6296,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD paramsLongNatOrigin}, ======= @@ -6204,12 +6351,16 @@ static const MethodMapping projectionMethodMappings[] = { ======= paramsLonNatOrigin}, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + paramsLonNatOrigin}, +>>>>>>> locationtech-main {"Loximuthal", 0, "Loximuthal", "loxim", nullptr, paramsLoxim}, {"Quartic Authalic", 0, "Quartic_Authalic", "qua_aut", nullptr, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a8fbb11965 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -6394,6 +6545,9 @@ static const MethodMapping projectionMethodMappings[] = { ======= paramsLonNatOrigin}, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + paramsLonNatOrigin}, +>>>>>>> locationtech-main {"Transverse Cylindrical Equal Area", 0, "Transverse_Cylindrical_Equal_Area", "tcea", nullptr, paramsObliqueStereo}, @@ -6406,6 +6560,7 @@ static const MethodMapping projectionMethodMappings[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6528,6 +6683,9 @@ static const MethodMapping projectionMethodMappings[] = { ======= "eqearth", nullptr, paramsLonNatOrigin}, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "eqearth", nullptr, paramsLonNatOrigin}, +>>>>>>> locationtech-main {EPSG_NAME_METHOD_LABORDE_OBLIQUE_MERCATOR, EPSG_CODE_METHOD_LABORDE_OBLIQUE_MERCATOR, "Laborde_Oblique_Mercator", @@ -6571,6 +6729,7 @@ const struct MethodNameCode methodNameCodes[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6693,6 +6852,9 @@ const struct MethodNameCode methodNameCodes[] = { ======= METHOD_NAME_CODE(TUNISIA_MAPPING_GRID), >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + METHOD_NAME_CODE(TUNISIA_MAPPING_GRID), +>>>>>>> locationtech-main METHOD_NAME_CODE(ALBERS_EQUAL_AREA), METHOD_NAME_CODE(LAMBERT_CONIC_CONFORMAL_2SP), METHOD_NAME_CODE(LAMBERT_CONIC_CONFORMAL_2SP_BELGIUM), @@ -7133,6 +7295,7 @@ static const ParamMapping paramSouthPoleLatGRIB = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7255,6 +7418,9 @@ static const ParamMapping paramSouthPoleLonGRIB = { ======= static const ParamMapping paramSouthPoleLonGRIB = { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static const ParamMapping paramSouthPoleLonGRIB = { +>>>>>>> locationtech-main PROJ_WKT2_NAME_PARAMETER_SOUTH_POLE_LONGITUDE_GRIB_CONVENTION, 0, nullptr, common::UnitOfMeasure::Type::ANGULAR, nullptr}; @@ -7270,6 +7436,7 @@ static const ParamMapping *const paramsPoleRotationGRIBConvention[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7392,6 +7559,9 @@ static const ParamMapping *const paramsPoleRotationGRIBConvention[] = { ======= ¶mSouthPoleLatGRIB, ¶mSouthPoleLonGRIB, ¶mAxisRotationGRIB, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ¶mSouthPoleLatGRIB, ¶mSouthPoleLonGRIB, ¶mAxisRotationGRIB, +>>>>>>> locationtech-main nullptr}; static const ParamMapping paramGridNorthPoleLatitudeNetCDF = { diff --git a/src/iso19111/operation/singleoperation.cpp b/src/iso19111/operation/singleoperation.cpp index af0cce54386e..f5dea13ec9ed 100644 --- a/src/iso19111/operation/singleoperation.cpp +++ b/src/iso19111/operation/singleoperation.cpp @@ -207,6 +207,7 @@ CoordinateOperation::sourceCoordinateEpoch() const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -329,6 +330,9 @@ CoordinateOperation::sourceCoordinateEpoch() const { ======= return d->sourceCoordinateEpoch_; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return d->sourceCoordinateEpoch_; +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -346,6 +350,7 @@ CoordinateOperation::targetCoordinateEpoch() const { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -468,6 +473,9 @@ CoordinateOperation::targetCoordinateEpoch() const { ======= return d->targetCoordinateEpoch_; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + return d->targetCoordinateEpoch_; +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -523,6 +531,7 @@ void CoordinateOperation::setCRSs(const CoordinateOperation *in, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -665,6 +674,8 @@ void CoordinateOperation::setTargetCoordinateEpoch( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main void CoordinateOperation::setAccuracies( const std::vector &accuracies) { d->coordinateOperationAccuracies_ = accuracies; @@ -2301,6 +2312,7 @@ bool Transformation::isGeographic3DToGravityRelatedHeight( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "1118", // Geog3D to Geog2D+GravityRelatedHeight (ISG) ======= @@ -2406,6 +2418,8 @@ bool Transformation::isGeographic3DToGravityRelatedHeight( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "9661", // Geographic3D to GravityRelatedHeight (EGM) "9662", // Geographic3D to GravityRelatedHeight (Ausgeoid98) "9663", // Geographic3D to GravityRelatedHeight (OSGM-GB) diff --git a/src/iso19111/operation/transformation.cpp b/src/iso19111/operation/transformation.cpp index 08dd912eec79..d1572137db0c 100644 --- a/src/iso19111/operation/transformation.cpp +++ b/src/iso19111/operation/transformation.cpp @@ -740,6 +740,7 @@ static TransformationNNPtr createFifteenParamsTransform( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -888,6 +889,10 @@ static TransformationNNPtr createFifteenParamsTransform( * This method is defined as [EPSG:1053] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1053) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1053] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1053) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. @@ -969,6 +974,7 @@ TransformationNNPtr Transformation::createTimeDependentPositionVector( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1117,6 +1123,10 @@ TransformationNNPtr Transformation::createTimeDependentPositionVector( * This method is defined as [EPSG:1056] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1056) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1056] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1056) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. @@ -1229,6 +1239,7 @@ static TransformationNNPtr _createMolodensky( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1377,6 +1388,10 @@ static TransformationNNPtr _createMolodensky( * This method is defined as [EPSG:9604] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9604) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9604] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9604) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. @@ -1418,6 +1433,7 @@ TransformationNNPtr Transformation::createMolodensky( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1566,6 +1582,10 @@ TransformationNNPtr Transformation::createMolodensky( * This method is defined as [EPSG:9605] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9605) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9605] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9605) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. @@ -1766,6 +1786,7 @@ buildAccuracyZero() { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1942,6 +1963,11 @@ buildAccuracyZero() { * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9601) * * >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9601] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9601) + * * +>>>>>>> locationtech-main * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. * @param sourceCRSIn Source CRS. @@ -1972,6 +1998,7 @@ TransformationNNPtr Transformation::createLongitudeRotation( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2148,6 +2175,11 @@ TransformationNNPtr Transformation::createLongitudeRotation( * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9619) * * >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9619] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9619) + * * +>>>>>>> locationtech-main * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. * @param sourceCRSIn Source CRS. @@ -2160,6 +2192,7 @@ TransformationNNPtr Transformation::createLongitudeRotation( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2282,6 +2315,9 @@ TransformationNNPtr Transformation::createLongitudeRotation( ======= * @param offsetLon Longitude offset to add. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * @param offsetLon Longitude offset to add. +>>>>>>> locationtech-main * @param accuracies Vector of positional accuracy (might be empty). * @return new Transformation. */ @@ -2295,6 +2331,7 @@ TransformationNNPtr Transformation::createGeographic2DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2417,6 +2454,9 @@ TransformationNNPtr Transformation::createGeographic2DOffsets( ======= const common::Angle &offsetLon, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon, +>>>>>>> locationtech-main const std::vector &accuracies) { return create( properties, sourceCRSIn, targetCRSIn, nullptr, @@ -2431,6 +2471,7 @@ TransformationNNPtr Transformation::createGeographic2DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2553,6 +2594,9 @@ TransformationNNPtr Transformation::createGeographic2DOffsets( ======= VectorOfValues{offsetLat, offsetLon}, accuracies); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + VectorOfValues{offsetLat, offsetLon}, accuracies); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -2566,6 +2610,7 @@ TransformationNNPtr Transformation::createGeographic2DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2742,6 +2787,11 @@ TransformationNNPtr Transformation::createGeographic2DOffsets( * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9660) * * >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9660] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9660) + * * +>>>>>>> locationtech-main * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. * @param sourceCRSIn Source CRS. @@ -2754,6 +2804,7 @@ TransformationNNPtr Transformation::createGeographic2DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2876,6 +2927,9 @@ TransformationNNPtr Transformation::createGeographic2DOffsets( ======= * @param offsetLon Longitude offset to add. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * @param offsetLon Longitude offset to add. +>>>>>>> locationtech-main * @param offsetHeight Height offset to add. * @param accuracies Vector of positional accuracy (might be empty). * @return new Transformation. @@ -2890,6 +2944,7 @@ TransformationNNPtr Transformation::createGeographic3DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3012,6 +3067,9 @@ TransformationNNPtr Transformation::createGeographic3DOffsets( ======= const common::Angle &offsetLon, const common::Length &offsetHeight, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon, const common::Length &offsetHeight, +>>>>>>> locationtech-main const std::vector &accuracies) { return create( properties, sourceCRSIn, targetCRSIn, nullptr, @@ -3027,6 +3085,7 @@ TransformationNNPtr Transformation::createGeographic3DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3149,6 +3208,9 @@ TransformationNNPtr Transformation::createGeographic3DOffsets( ======= VectorOfValues{offsetLat, offsetLon, offsetHeight}, accuracies); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + VectorOfValues{offsetLat, offsetLon, offsetHeight}, accuracies); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -3164,6 +3226,7 @@ TransformationNNPtr Transformation::createGeographic3DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3340,6 +3403,11 @@ TransformationNNPtr Transformation::createGeographic3DOffsets( * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9618) * * >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9618] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9618) + * * +>>>>>>> locationtech-main * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. * @param sourceCRSIn Source CRS. @@ -3352,6 +3420,7 @@ TransformationNNPtr Transformation::createGeographic3DOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3474,6 +3543,9 @@ TransformationNNPtr Transformation::createGeographic3DOffsets( ======= * @param offsetLon Longitude offset to add. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * @param offsetLon Longitude offset to add. +>>>>>>> locationtech-main * @param offsetHeight Geoid undulation to add. * @param accuracies Vector of positional accuracy (might be empty). * @return new Transformation. @@ -3488,6 +3560,7 @@ TransformationNNPtr Transformation::createGeographic2DWithHeightOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3610,6 +3683,9 @@ TransformationNNPtr Transformation::createGeographic2DWithHeightOffsets( ======= const common::Angle &offsetLon, const common::Length &offsetHeight, >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const common::Angle &offsetLon, const common::Length &offsetHeight, +>>>>>>> locationtech-main const std::vector &accuracies) { return create( properties, sourceCRSIn, targetCRSIn, nullptr, @@ -3626,6 +3702,7 @@ TransformationNNPtr Transformation::createGeographic2DWithHeightOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3748,6 +3825,9 @@ TransformationNNPtr Transformation::createGeographic2DWithHeightOffsets( ======= VectorOfValues{offsetLat, offsetLon, offsetHeight}, accuracies); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + VectorOfValues{offsetLat, offsetLon, offsetHeight}, accuracies); +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -3761,6 +3841,7 @@ TransformationNNPtr Transformation::createGeographic2DWithHeightOffsets( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3937,6 +4018,11 @@ TransformationNNPtr Transformation::createGeographic2DWithHeightOffsets( * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9616) * * >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:9616] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::9616) + * * +>>>>>>> locationtech-main * @param properties See \ref general_properties of the Transformation. * At minimum the name should be defined. * @param sourceCRSIn Source CRS. @@ -3968,6 +4054,7 @@ TransformationNNPtr Transformation::createVerticalOffset( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4116,6 +4203,10 @@ TransformationNNPtr Transformation::createVerticalOffset( * This method is defined as [EPSG:1069] * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1069) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * This method is defined as [EPSG:1069] + * (https://www.epsg-registry.org/export.htm?gml=urn:ogc:def:method:EPSG::1069) +>>>>>>> locationtech-main * * @param properties See \ref general_properties of the conversion. If the name * is not provided, it is automatically set. diff --git a/src/iso19111/static.cpp b/src/iso19111/static.cpp index 1c36a255e329..b17249895cc7 100644 --- a/src/iso19111/static.cpp +++ b/src/iso19111/static.cpp @@ -234,6 +234,7 @@ DEFINE_WKT_CONSTANT(ANCHOR); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD DEFINE_WKT_CONSTANT(ANCHOREPOCH); ======= <<<<<<< HEAD @@ -338,6 +339,8 @@ DEFINE_WKT_CONSTANT(ANCHOREPOCH); >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main DEFINE_WKT_CONSTANT(CONVERSION); DEFINE_WKT_CONSTANT(METHOD); DEFINE_WKT_CONSTANT(REMARK); @@ -396,6 +399,7 @@ DEFINE_WKT_CONSTANT(GEOIDMODEL); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -527,6 +531,8 @@ DEFINE_WKT_CONSTANT(RANGEMEANING); >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main DEFINE_WKT_CONSTANT(GEODETICCRS); DEFINE_WKT_CONSTANT(GEODETICDATUM); @@ -780,6 +786,7 @@ const AxisDirection AxisDirection::UNSPECIFIED("unspecified"); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -917,6 +924,8 @@ const RangeMeaning RangeMeaning::WRAPAROUND("wraparound"); >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main //! @cond Doxygen_Suppress std::map AxisDirectionWKT1::registry; diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 1b282e61cfa5..b8334bb2aa65 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -179,6 +179,7 @@ set(SRC_LIBPROJ_ISO19111 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD iso19111/coordinates.cpp ======= @@ -284,6 +285,8 @@ set(SRC_LIBPROJ_ISO19111 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main iso19111/crs.cpp iso19111/datum.cpp iso19111/coordinatesystem.cpp @@ -444,6 +447,7 @@ add_custom_target(check_wkt2_grammar_md5 ALL <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -566,6 +570,9 @@ add_custom_target(check_wkt2_grammar_md5 ALL ======= "-DEXPECTED_MD5SUM=f9ee543089ae55a895ae6e16cd0a68b2" >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "-DEXPECTED_MD5SUM=f9ee543089ae55a895ae6e16cd0a68b2" +>>>>>>> locationtech-main -P "${CMAKE_CURRENT_SOURCE_DIR}/check_md5sum.cmake" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/wkt2_grammar.y" diff --git a/src/pipeline.cpp b/src/pipeline.cpp index 6d3885f59107..e4aa30bb852b 100644 --- a/src/pipeline.cpp +++ b/src/pipeline.cpp @@ -384,6 +384,7 @@ static void set_ellipsoid(PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -696,6 +697,10 @@ static void set_ellipsoid(PJ *P) { geod_init(P->geod, P->a, P->es / (1 + sqrt(P->one_es))); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if( pj_calc_ellipsoid_params (P, P->a, P->es) == 0 ) + geod_init(P->geod, P->a, P->f); +>>>>>>> locationtech-main /* Re-attach the dangling list */ /* Note: cur will always be non 0 given argv_sentinel presence, */ diff --git a/src/proj.h b/src/proj.h index eb7b5922b0ce..6f102e9c82ed 100644 --- a/src/proj.h +++ b/src/proj.h @@ -812,6 +812,7 @@ typedef enum <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -926,6 +927,8 @@ typedef enum >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } PJ_TYPE; /** Comparison criterion. */ @@ -1643,6 +1646,7 @@ PJ PROJ_DLL *proj_concatoperation_get_step(PJ_CONTEXT *ctx, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1757,6 +1761,8 @@ double PROJ_DLL proj_coordinate_metadata_get_epoch(PJ_CONTEXT *ctx, const PJ *ob >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /**@}*/ #ifdef __cplusplus diff --git a/src/proj_constants.h b/src/proj_constants.h index f4d036763dd3..61aafe389708 100644 --- a/src/proj_constants.h +++ b/src/proj_constants.h @@ -57,6 +57,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -236,6 +237,11 @@ #define EPSG_CODE_METHOD_TUNISIA_MAPPING_GRID 9816 >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#define EPSG_NAME_METHOD_TUNISIA_MAPPING_GRID "Tunisia Mapping Grid" +#define EPSG_CODE_METHOD_TUNISIA_MAPPING_GRID 9816 + +>>>>>>> locationtech-main #define EPSG_NAME_METHOD_ALBERS_EQUAL_AREA "Albers Equal Area" #define EPSG_CODE_METHOD_ALBERS_EQUAL_AREA 9822 diff --git a/src/proj_experimental.h b/src/proj_experimental.h index 828a0be7e265..ca0a22c7623c 100644 --- a/src/proj_experimental.h +++ b/src/proj_experimental.h @@ -408,6 +408,7 @@ PJ PROJ_DLL *proj_create_conversion_tunisia_mapping_grid( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -543,6 +544,8 @@ PJ PROJ_DLL *proj_create_conversion_tunisia_mining_grid( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PJ PROJ_DLL *proj_create_conversion_albers_equal_area( PJ_CONTEXT *ctx, double latitude_false_origin, diff --git a/src/proj_internal.h b/src/proj_internal.h index f935c282953b..ffcd9e2c2bf3 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -583,6 +583,7 @@ struct PJconsts { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -734,6 +735,10 @@ struct PJconsts { NS_PROJ::common::IdentifiedObjectPtr iso_obj{}; bool iso_obj_is_coordinate_operation = false; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + NS_PROJ::common::IdentifiedObjectPtr iso_obj{}; + bool iso_obj_is_coordinate_operation = false; +>>>>>>> locationtech-main // cached results mutable std::string lastWKT{}; @@ -757,6 +762,7 @@ struct PJconsts { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -871,6 +877,8 @@ struct PJconsts { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /************************************************************************************* @@ -978,6 +986,7 @@ struct pj_ctx{ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1092,6 +1101,8 @@ struct pj_ctx{ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main void (*logger)(void *, int, const char *) = nullptr; void *logger_app_data = nullptr; struct projCppContext* cpp_context = nullptr; /* internal context for C++ code */ @@ -1145,6 +1156,7 @@ struct pj_ctx{ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1197,6 +1209,8 @@ struct pj_ctx{ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /* Generate pj_list external or make list from include file */ #ifndef PJ_DATUMS_ C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[]; @@ -1210,6 +1224,7 @@ C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[]; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1306,6 +1321,8 @@ C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[]; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #ifdef PJ_LIB_ @@ -1387,6 +1404,7 @@ double pj_sinhpsi2tanphi(PJ_CONTEXT *, const double, const double); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= double pj_qsfn_(double, PJ *); <<<<<<< HEAD @@ -1503,6 +1521,9 @@ double pj_qsfn_(double, PJ *); ======= double pj_qsfn_(double, PJ *); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +double pj_qsfn_(double, PJ *); +>>>>>>> locationtech-main double *pj_authset(double); double pj_authlat(double, double *); @@ -1526,6 +1547,7 @@ PJ_LP pj_inv_gauss(PJ_CONTEXT *, PJ_LP, const void *); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1648,6 +1670,9 @@ struct PJ_DATUMS PROJ_DLL *pj_get_datums_ref( void ); ======= struct PJ_DATUMS PROJ_DLL *pj_get_datums_ref( void ); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +struct PJ_DATUMS PROJ_DLL *pj_get_datums_ref( void ); +>>>>>>> locationtech-main PJ *pj_new(void); PJ *pj_default_destructor (PJ *P, int errlev); diff --git a/src/proj_symbol_rename.h b/src/proj_symbol_rename.h index e07131f59b42..6f85bf134647 100644 --- a/src/proj_symbol_rename.h +++ b/src/proj_symbol_rename.h @@ -72,6 +72,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #define proj_coordinate_metadata_get_epoch internal_proj_coordinate_metadata_get_epoch ======= <<<<<<< HEAD @@ -176,6 +177,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #define proj_coordoperation_create_inverse internal_proj_coordoperation_create_inverse #define proj_coordoperation_get_accuracy internal_proj_coordoperation_get_accuracy #define proj_coordoperation_get_grid_used internal_proj_coordoperation_get_grid_used @@ -256,6 +259,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #define proj_create_conversion_tunisia_mining_grid internal_proj_create_conversion_tunisia_mining_grid ======= <<<<<<< HEAD @@ -360,6 +364,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #define proj_create_conversion_two_point_equidistant internal_proj_create_conversion_two_point_equidistant #define proj_create_conversion_utm internal_proj_create_conversion_utm #define proj_create_conversion_van_der_grinten internal_proj_create_conversion_van_der_grinten diff --git a/src/projections/aeqd.cpp b/src/projections/aeqd.cpp index 5e3c08d0255d..c29ac6d2c8bb 100644 --- a/src/projections/aeqd.cpp +++ b/src/projections/aeqd.cpp @@ -104,6 +104,7 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -488,6 +489,11 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double lat1, lon1, lat2, lon2; + + coslam = cos(lp.lam); +>>>>>>> locationtech-main switch (Q->mode) { case N_POLE: coslam = - coslam; @@ -501,6 +507,7 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -789,6 +796,10 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + cosphi = cos(lp.phi); + sinphi = sin(lp.phi); +>>>>>>> locationtech-main rho = fabs(Q->Mp - pj_mlfn(lp.phi, sinphi, cosphi, Q->en)); xy.x = rho * sin(lp.lam); xy.y = rho * coslam; @@ -808,6 +819,7 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -920,6 +932,8 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main lat1 = P->phi0 / DEG_TO_RAD; lon1 = 0; @@ -930,6 +944,7 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -966,6 +981,8 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward >>>>>>> 6a0b9804ba (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) ======= >>>>>>> ba006ad292 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main geod_inverse(&Q->g, lat1, lon1, lat2, lon2, &s12, &azi1, &azi2); @@ -975,6 +992,7 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) @@ -1400,6 +1418,8 @@ static PJ_XY aeqd_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward xy.x = s12 * sin(azi1) / P->a; xy.y = s12 * cos(azi1) / P->a; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main break; } return xy; @@ -1417,6 +1437,7 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -1490,6 +1511,8 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward >>>>>>> c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= >>>>>>> a30c7d3fa7 (Merge pull request #3523 from rouault/cleanup_aeqd_s_forward) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main if (Q->mode == EQUIT) @@ -1506,6 +1529,7 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= double coslam, cosphi, sinphi; ======= @@ -1897,6 +1921,8 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward oblcon: if (fabs(fabs(xy.y) - 1.) < TOL) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (xy.y < 0.) { proj_errno_set(P, PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN); return xy; @@ -1911,6 +1937,7 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -1984,6 +2011,8 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward >>>>>>> c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= >>>>>>> a30c7d3fa7 (Merge pull request #3523 from rouault/cleanup_aeqd_s_forward) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main } else @@ -2033,6 +2062,7 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= else { ======= @@ -2923,6 +2953,8 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (fabs(lp.phi - M_HALFPI) < EPS10) { proj_errno_set(P, PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN); return xy; @@ -2936,6 +2968,7 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3248,6 +3281,10 @@ static PJ_XY aeqd_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward xy.y *= coslam; break; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + xy.x = xy.y * sinlam; + xy.y *= coslam; +>>>>>>> locationtech-main } return xy; } @@ -3282,6 +3319,7 @@ static PJ_LP aeqd_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3665,6 +3703,11 @@ static PJ_LP aeqd_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double azi1, azi2, s12, lat1, lon1, lat2, lon2; + + if ((s12 = hypot(xy.x, xy.y)) < EPS10) { +>>>>>>> locationtech-main lp.phi = P->phi0; lp.lam = 0.; return (lp); @@ -3678,6 +3721,7 @@ static PJ_LP aeqd_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -3751,6 +3795,8 @@ static PJ_LP aeqd_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse >>>>>>> c8fb3456cf (Merge pull request #3524 from cffk/merid-update-fix) ======= >>>>>>> ba006ad292 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main lat1 = P->phi0 / DEG_TO_RAD; lon1 = 0; @@ -3764,6 +3810,7 @@ static PJ_LP aeqd_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> locationtech-main @@ -4165,6 +4212,8 @@ static PJ_LP aeqd_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse } else { /* Polar */ lp.phi = pj_inv_mlfn(Q->mode == N_POLE ? Q->Mp - c : Q->Mp + c, Q->en); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main lp.lam = atan2(xy.x, Q->mode == N_POLE ? -xy.y : xy.y); } return lp; @@ -4228,6 +4277,7 @@ PJ *PROJECTION(aeqd) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4514,6 +4564,9 @@ PJ *PROJECTION(aeqd) { ======= geod_init(&Q->g, P->a, P->es / (1 + sqrt(P->one_es))); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + geod_init(&Q->g, 1, P->f); +>>>>>>> locationtech-main if (fabs(fabs(P->phi0) - M_HALFPI) < EPS10) { Q->mode = P->phi0 < 0. ? S_POLE : N_POLE; diff --git a/src/projections/calcofi.cpp b/src/projections/calcofi.cpp index 9eafeaafab51..8bb987d80165 100644 --- a/src/projections/calcofi.cpp +++ b/src/projections/calcofi.cpp @@ -36,6 +36,7 @@ whatever ellipsoid is provided. */ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -158,6 +159,9 @@ whatever ellipsoid is provided. */ ======= #define PT_O_LAMBDA -2.1144663887911301 /* lon -121.15 and */ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#define PT_O_LAMBDA -2.1144663887911301 /* lon -121.15 and */ +>>>>>>> locationtech-main #define PT_O_PHI 0.59602993955606354 /* lat 34.15 */ #define ROTATION_ANGLE 0.52359877559829882 /*CalCOFI angle of 30 deg in rad */ diff --git a/src/projections/geos.cpp b/src/projections/geos.cpp index 60d8470861e0..a37c5f5921a9 100644 --- a/src/projections/geos.cpp +++ b/src/projections/geos.cpp @@ -65,6 +65,7 @@ static PJ_XY geos_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -187,6 +188,9 @@ static PJ_XY geos_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward ======= ** position on earth surface (lon,lat).*/ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ** position on earth surface (lon,lat).*/ +>>>>>>> locationtech-main tmp = cos(lp.phi); Vx = cos (lp.lam) * tmp; Vy = sin (lp.lam) * tmp; @@ -226,6 +230,7 @@ static PJ_XY geos_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -348,6 +353,9 @@ static PJ_XY geos_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward ======= ** position on earth surface (lon,lat).*/ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ** position on earth surface (lon,lat).*/ +>>>>>>> locationtech-main r = (Q->radius_p) / hypot(Q->radius_p * cos (lp.phi), sin (lp.phi)); Vx = r * cos (lp.lam) * cos (lp.phi); Vy = r * sin (lp.lam) * cos (lp.phi); diff --git a/src/projections/gnom.cpp b/src/projections/gnom.cpp index 41d8d665b18c..b9184ec62d11 100644 --- a/src/projections/gnom.cpp +++ b/src/projections/gnom.cpp @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -84,6 +85,8 @@ ======= >>>>>>> ba006ad292 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main #include #include "geodesic.h" @@ -92,6 +95,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -414,6 +418,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PROJ_HEAD(gnom, "Gnomonic") "\n\tAzi, Sph"; @@ -441,6 +447,7 @@ struct pj_opaque { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -711,6 +718,9 @@ struct pj_opaque { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + struct geod_geodesic g; +>>>>>>> locationtech-main }; } // anonymous namespace @@ -816,6 +826,7 @@ static PJ_LP gnom_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -929,6 +940,8 @@ static PJ_LP gnom_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main static PJ_XY gnom_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ PJ_XY xy = {0.0,0.0}; struct pj_opaque *Q = static_cast(P->opaque); @@ -1008,6 +1021,7 @@ static PJ_LP gnom_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1236,6 +1250,8 @@ static PJ_LP gnom_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PJ *PROJECTION(gnom) { struct pj_opaque *Q = static_cast(calloc (1, sizeof (struct pj_opaque))); @@ -1251,6 +1267,7 @@ PJ *PROJECTION(gnom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1363,6 +1380,8 @@ PJ *PROJECTION(gnom) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main if (P->es == 0) { if (fabs(fabs(P->phi0) - M_HALFPI) < EPS10) { @@ -1379,6 +1398,7 @@ PJ *PROJECTION(gnom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -1415,6 +1435,8 @@ PJ *PROJECTION(gnom) { >>>>>>> 6a0b9804ba (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) ======= >>>>>>> ba006ad292 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main P->inv = gnom_s_inverse; @@ -1428,6 +1450,7 @@ PJ *PROJECTION(gnom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) @@ -1787,6 +1810,8 @@ PJ *PROJECTION(gnom) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main P->es = 0.; return P; diff --git a/src/projections/isea.cpp b/src/projections/isea.cpp index 8e69c8cb292f..d77820260093 100644 --- a/src/projections/isea.cpp +++ b/src/projections/isea.cpp @@ -52,6 +52,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -174,6 +175,9 @@ ======= #define ISEA_STD_LON .19634954084936207740 >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#define ISEA_STD_LON .19634954084936207740 +>>>>>>> locationtech-main namespace { // anonymous namespace struct hex { @@ -300,6 +304,7 @@ struct isea_geo { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -422,6 +427,9 @@ struct isea_geo { ======= double lon, lat; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double lon, lat; +>>>>>>> locationtech-main }; } // anonymous namespace @@ -518,6 +526,7 @@ static double az_adjustment(int triangle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -672,6 +681,11 @@ static double az_adjustment(int triangle) cos(c.lat) * sin(v.lat) - sin(c.lat) * cos(v.lat) * cos(v.lon - c.lon)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + adj = atan2(cos(v.lat) * sin(v.lon - c.lon), + cos(c.lat) * sin(v.lat) + - sin(c.lat) * cos(v.lat) * cos(v.lon - c.lon)); +>>>>>>> locationtech-main return adj; } @@ -789,6 +803,7 @@ static int isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -911,6 +926,9 @@ static int isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) ======= + cos(center.lat) * cos(ll->lat) * cos(ll->lon - center.lon)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + + cos(center.lat) * cos(ll->lat) * cos(ll->lon - center.lon)); +>>>>>>> locationtech-main /* not on this triangle */ if (z > g + 0.000005) { /* TODO DBL_EPSILON */ continue; @@ -923,6 +941,7 @@ static int isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1045,6 +1064,9 @@ static int isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) ======= Az = sph_azimuth(center.lon, center.lat, ll->lon, ll->lat); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + Az = sph_azimuth(center.lon, center.lat, ll->lon, ll->lat); +>>>>>>> locationtech-main /* step 2 */ @@ -1155,6 +1177,7 @@ static int isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1277,6 +1300,9 @@ static int isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) ======= PJ_TODEG(ll->lon), PJ_TODEG(ll->lat)); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + PJ_TODEG(ll->lon), PJ_TODEG(ll->lat)); +>>>>>>> locationtech-main exit(EXIT_FAILURE); } @@ -1316,6 +1342,7 @@ static struct isea_geo snyder_ctran(struct isea_geo * np, struct isea_geo * pt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1470,6 +1497,11 @@ static struct isea_geo snyder_ctran(struct isea_geo * np, struct isea_geo * pt) alpha = np->lat; beta = np->lon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + lambda = pt->lon; + alpha = np->lat; + beta = np->lon; +>>>>>>> locationtech-main lambda0 = beta; cos_p = cos(phi); @@ -1504,6 +1536,7 @@ static struct isea_geo snyder_ctran(struct isea_geo * np, struct isea_geo * pt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1626,6 +1659,9 @@ static struct isea_geo snyder_ctran(struct isea_geo * np, struct isea_geo * pt) ======= npt.lon = lambdap; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + npt.lon = lambdap; +>>>>>>> locationtech-main return npt; } @@ -1642,6 +1678,7 @@ static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1773,6 +1810,8 @@ static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main np->lon += M_PI; npt = snyder_ctran(np, pt); np->lon -= M_PI; @@ -1781,6 +1820,7 @@ static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -1823,6 +1863,8 @@ static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /* * snyder is down tri 3, isea is along side of tri1 from vertex 0 to @@ -1835,6 +1877,7 @@ static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1910,6 +1953,8 @@ static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main npt.lon += M_PI; /* normalize longitude */ npt.lon = fmod(npt.lon, 2 * M_PI); @@ -1923,6 +1968,7 @@ static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2041,6 +2087,8 @@ static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return npt; } @@ -2061,6 +2109,7 @@ static int isea_grid_init(struct isea_dgg * g) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2183,6 +2232,9 @@ static int isea_grid_init(struct isea_dgg * g) ======= g->o_lon = ISEA_STD_LON; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + g->o_lon = ISEA_STD_LON; +>>>>>>> locationtech-main g->o_az = 0.0; g->aperture = 4; g->resolution = 6; @@ -2204,6 +2256,7 @@ static void isea_orient_isea(struct isea_dgg * g) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2326,6 +2379,9 @@ static void isea_orient_isea(struct isea_dgg * g) ======= g->o_lon = ISEA_STD_LON; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + g->o_lon = ISEA_STD_LON; +>>>>>>> locationtech-main g->o_az = 0.0; } @@ -2352,6 +2408,7 @@ static int isea_transform(struct isea_dgg * g, struct isea_geo * in, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2474,6 +2531,9 @@ static int isea_transform(struct isea_dgg * g, struct isea_geo * in, ======= pole.lon = g->o_lon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + pole.lon = g->o_lon; +>>>>>>> locationtech-main i = isea_ctran(&pole, in, g->o_az); @@ -2880,6 +2940,7 @@ static PJ_XY isea_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3002,6 +3063,9 @@ static PJ_XY isea_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward ======= in.lon = lp.lam; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + in.lon = lp.lam; +>>>>>>> locationtech-main in.lat = lp.phi; try { diff --git a/src/projections/qsc.cpp b/src/projections/qsc.cpp index efc04468a424..7ca7761a7444 100644 --- a/src/projections/qsc.cpp +++ b/src/projections/qsc.cpp @@ -115,6 +115,7 @@ static double qsc_fwd_equat_face_theta(double phi, double y, double x, enum Area <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -260,6 +261,10 @@ static double qsc_shift_longitude_origin(double longitude, double offset) { static double qsc_shift_lon_origin(double lon, double offset) { double slon = lon + offset; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static double qsc_shift_lon_origin(double lon, double offset) { + double slon = lon + offset; +>>>>>>> locationtech-main if (slon < -M_PI) { slon += M_TWOPI; } else if (slon > +M_PI) { @@ -279,6 +284,7 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -401,6 +407,9 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward ======= double lat, lon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double lat, lon; +>>>>>>> locationtech-main double theta, phi; double t, mu; /* nu; */ enum Area area; @@ -421,6 +430,7 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -543,6 +553,9 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward ======= /* Convert the input lat, lon into theta, phi as used by QSC. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + /* Convert the input lat, lon into theta, phi as used by QSC. +>>>>>>> locationtech-main * This depends on the cube face and the area on it. * For the top and bottom face, we can compute theta and phi * directly from phi, lam. For the other faces, we must use @@ -554,6 +567,7 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -820,6 +834,8 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main lon = lp.lam; if (Q->face == FACE_TOP) { phi = M_HALFPI - lat; @@ -852,6 +868,7 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward theta = (lon > 0.0 ? -lon + M_PI : -lon - M_PI); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -874,6 +891,8 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } } else { double q, r, s; @@ -888,6 +907,7 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1078,6 +1098,8 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main lon = qsc_shift_lon_origin(lon, +M_HALFPI); } else if (Q->face == FACE_BACK) { lon = qsc_shift_lon_origin(lon, +M_PI); @@ -1090,6 +1112,7 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward coslon = cos(lon); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -1112,6 +1135,8 @@ static PJ_XY qsc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main q = coslat * coslon; r = coslat * sinlon; s = sinlat; @@ -1282,6 +1307,7 @@ static PJ_LP qsc_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1413,6 +1439,8 @@ static PJ_LP qsc_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main lp.lam = qsc_shift_lon_origin(lp.lam, -M_HALFPI); } else if (Q->face == FACE_BACK) { lp.lam = qsc_shift_lon_origin(lp.lam, -M_PI); @@ -1421,6 +1449,7 @@ static PJ_LP qsc_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -1463,6 +1492,8 @@ static PJ_LP qsc_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } } diff --git a/src/projections/s2.cpp b/src/projections/s2.cpp index 37ab6afa1e95..0f9966fd0b38 100644 --- a/src/projections/s2.cpp +++ b/src/projections/s2.cpp @@ -287,6 +287,7 @@ static PJ_XY s2_forward (PJ_LP lp, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -409,6 +410,9 @@ static PJ_XY s2_forward (PJ_LP lp, PJ *P) { ======= double lat, lon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double lat, lon; +>>>>>>> locationtech-main /* Convert the geodetic latitude to a geocentric latitude. * This corresponds to the shift from the ellipsoid to the sphere @@ -425,6 +429,7 @@ static PJ_XY s2_forward (PJ_LP lp, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -576,6 +581,11 @@ static PJ_XY s2_forward (PJ_LP lp, PJ *P) { // Convert the lat/lon to x,y,z on the unit sphere >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + lon = lp.lam; + + // Convert the lat/lon to x,y,z on the unit sphere +>>>>>>> locationtech-main double x, y, z; double sinlat, coslat; double sinlon, coslon; @@ -589,6 +599,7 @@ static PJ_XY s2_forward (PJ_LP lp, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -734,6 +745,10 @@ static PJ_XY s2_forward (PJ_LP lp, PJ *P) { sinlon = sin(lon); coslon = cos(lon); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + sinlon = sin(lon); + coslon = cos(lon); +>>>>>>> locationtech-main x = coslat * coslon; y = coslat * sinlon; z = sinlat; diff --git a/src/projections/sch.cpp b/src/projections/sch.cpp index 036491f7fe25..0d6af3fa7568 100644 --- a/src/projections/sch.cpp +++ b/src/projections/sch.cpp @@ -82,6 +82,7 @@ static PJ_LPZ sch_inverse3d(PJ_XYZ xyz, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -204,6 +205,9 @@ static PJ_LPZ sch_inverse3d(PJ_XYZ xyz, PJ *P) { ======= /* Convert geocentric coordinates to lat lon */ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + /* Convert geocentric coordinates to lat lon */ +>>>>>>> locationtech-main return Q->cart->inv3d (xyz, Q->cart); } @@ -217,6 +221,7 @@ static PJ_XYZ sch_forward3d(PJ_LPZ lpz, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -339,6 +344,9 @@ static PJ_XYZ sch_forward3d(PJ_LPZ lpz, PJ *P) { ======= /* Convert lat lon to geocentric coordinates */ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + /* Convert lat lon to geocentric coordinates */ +>>>>>>> locationtech-main PJ_XYZ xyz = Q->cart->fwd3d (lpz, Q->cart); /* Adjust for offset */ @@ -360,6 +368,7 @@ static PJ_XYZ sch_forward3d(PJ_LPZ lpz, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -482,6 +491,9 @@ static PJ_XYZ sch_forward3d(PJ_LPZ lpz, PJ *P) { ======= /* Convert to local lat,lon */ >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + /* Convert to local lat,lon */ +>>>>>>> locationtech-main lpz = Q->cart_sph->inv3d (xyz, Q->cart_sph); /* Scale by radius */ diff --git a/src/projections/tmerc.cpp b/src/projections/tmerc.cpp index c949d102e264..3afd1034425a 100644 --- a/src/projections/tmerc.cpp +++ b/src/projections/tmerc.cpp @@ -582,6 +582,7 @@ static PJ_LP auto_e_inv (PJ_XY xy, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -704,6 +705,9 @@ static PJ_LP auto_e_inv (PJ_XY xy, PJ *P) { ======= // For k = 1 and lon = 3 (from central meridian), >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // For k = 1 and lon = 3 (from central meridian), +>>>>>>> locationtech-main // At lat = 0, we get x ~= 0.052, y = 0 // At lat = 90, we get x = 0, y ~= 1.57 // And the shape of this x=f(y) frontier curve is very very roughly a diff --git a/src/projections/vandg.cpp b/src/projections/vandg.cpp index e42f95fe7744..6c77f473a5f3 100644 --- a/src/projections/vandg.cpp +++ b/src/projections/vandg.cpp @@ -115,6 +115,7 @@ static PJ_LP vandg_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, invers <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -237,6 +238,9 @@ static PJ_LP vandg_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, invers ======= // This code path is triggered for coordinates generated in the forward path when |lon|>180deg and +over >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // This code path is triggered for coordinates generated in the forward path when |lon|>180deg and +over +>>>>>>> locationtech-main d = M_TWOPI - d; } // (29-18) but change pi/3 to 4*pi/3 to flip sign of cos diff --git a/src/strtod.cpp b/src/strtod.cpp index e1dcdd9d6dc0..cde3157dbea2 100644 --- a/src/strtod.cpp +++ b/src/strtod.cpp @@ -43,6 +43,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -168,6 +169,10 @@ #define PJ_STRTOD_WORK_BUFFER_SIZE 64 >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#define PJ_STRTOD_WORK_BUFFER_SIZE 64 + +>>>>>>> locationtech-main /************************************************************************/ /* pj_atof() */ /************************************************************************/ @@ -186,6 +191,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -308,6 +314,9 @@ ======= * pj_strtod(nptr, (char **)NULL); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + * pj_strtod(nptr, (char **)NULL); +>>>>>>> locationtech-main * * This function does the same as standard atof(3), but does not take * locale in account. That means, the decimal delimiter is always '.' @@ -334,6 +343,7 @@ double pj_atof( const char* nptr ) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -474,6 +484,10 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point) static char* replace_point_by_locale_point(const char* pszNumber, char point, char* pszWorkBuffer) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +static char* replace_point_by_locale_point(const char* pszNumber, char point, + char* pszWorkBuffer) +>>>>>>> locationtech-main { #if !defined(HAVE_LOCALECONV) @@ -502,6 +516,7 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -573,6 +588,8 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main char* pszNew; if( strlen(pszNumber) < PJ_STRTOD_WORK_BUFFER_SIZE ) { @@ -590,6 +607,7 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -695,6 +713,8 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main pszNew[pszPoint - pszNumber] = byPoint; return pszNew; } @@ -706,6 +726,7 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -863,6 +884,10 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, #else struct lconv *poLconv = localeconv(); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#else + struct lconv *poLconv = localeconv(); +>>>>>>> locationtech-main if ( poLconv && poLconv->decimal_point && poLconv->decimal_point[0] != '\0' ) @@ -882,6 +907,7 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -953,6 +979,8 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main char* pszNew; if( strlen(pszNumber) < PJ_STRTOD_WORK_BUFFER_SIZE ) { @@ -970,6 +998,7 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1075,6 +1104,8 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if( pszLocalePoint ) pszNew[pszLocalePoint - pszNumber] = ' '; if( pszPoint ) @@ -1090,6 +1121,7 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1241,6 +1273,10 @@ static char* replace_point_by_locale_point(const char* pszNumber, char point, #endif return (char*) pszNumber; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#endif + return (char*) pszNumber; +>>>>>>> locationtech-main } /************************************************************************/ @@ -1273,6 +1309,7 @@ double pj_strtod( const char *nptr, char **endptr ) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1537,6 +1574,8 @@ double pj_strtod( const char *nptr, char **endptr ) >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /* into the temporary buffer, replace the specified decimal delimiter */ /* with the one, taken from locale settings and use standard strtod() */ /* on that buffer. */ @@ -1560,6 +1599,7 @@ double pj_strtod( const char *nptr, char **endptr ) return dfValue; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -1582,4 +1622,6 @@ double pj_strtod( const char *nptr, char **endptr ) >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } diff --git a/src/tests/geodsigntest.c b/src/tests/geodsigntest.c index 1af3f674ef23..ae0a23e2b0f1 100644 --- a/src/tests/geodsigntest.c +++ b/src/tests/geodsigntest.c @@ -38,6 +38,7 @@ typedef double T; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -151,6 +152,8 @@ typedef double T; >>>>>>> bd2f3a692f (install.rst: improve instructions regarding proj-data (fixes #3539)) >>>>>>> b5faafdd4a (install.rst: improve instructions regarding proj-data (fixes #3539)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main #if !defined(OLD_BUGGY_REMQUO) /* * glibc prior to version 2.22 had a bug in remquo. This was reported in 2014 @@ -169,6 +172,7 @@ typedef double T; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -397,6 +401,8 @@ typedef double T; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main static const T wgs84_a = 6378137, wgs84_f = 1/298.257223563; /* WGS84 */ static int equiv(T x, T y) { @@ -498,6 +504,7 @@ int main() { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -800,6 +807,11 @@ int main() { ======= checksincosd(-810.0, -1.0, +0.0); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#if !OLD_BUGGY_REMQUO + checksincosd(-810.0, -1.0, +0.0); +#endif +>>>>>>> locationtech-main checksincosd(-720.0, -0.0, +1.0); checksincosd(-630.0, +1.0, +0.0); checksincosd(-540.0, -0.0, -1.0); @@ -826,6 +838,7 @@ int main() { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -900,6 +913,8 @@ int main() { ======= >>>>>>> 3c2c2fccef (install.rst: improve instructions regarding proj-data (fixes #3539)) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main #if !OLD_BUGGY_REMQUO checksincosd(+810.0, +1.0, +0.0); #endif @@ -910,6 +925,7 @@ int main() { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1228,6 +1244,8 @@ int main() { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main { T s1, c1, s2, c2, s3, c3; geod_sincosd( 9.0, &s1, &c1); @@ -1246,6 +1264,7 @@ int main() { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1516,6 +1535,9 @@ int main() { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#endif +>>>>>>> locationtech-main check( geod_atan2d(+0.0 , -0.0 ), +180 ); check( geod_atan2d(-0.0 , -0.0 ), -180 ); diff --git a/src/transformations/defmodel.cpp b/src/transformations/defmodel.cpp index 6f431f944844..544da441d2bf 100644 --- a/src/transformations/defmodel.cpp +++ b/src/transformations/defmodel.cpp @@ -115,6 +115,7 @@ struct Grid : public GridPrototype { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -305,6 +306,8 @@ struct Grid : public GridPrototype { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main bool getLonLatOffset(int ix, int iy, double &lonOffsetRadian, double &latOffsetRadian) const { if (!checkHorizontal(STR_DEGREE)) { @@ -319,6 +322,7 @@ struct Grid : public GridPrototype { lonOffsetRadian = lonOffsetDeg * DEG_TO_RAD; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -341,6 +345,8 @@ struct Grid : public GridPrototype { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main latOffsetRadian = latOffsetDeg * DEG_TO_RAD; return true; } @@ -412,6 +418,7 @@ struct Grid : public GridPrototype { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -566,6 +573,11 @@ struct Grid : public GridPrototype { double &latOffsetRadian, double &zOffset) const { return getLonLatOffset(ix, iy, lonOffsetRadian, latOffsetRadian) && >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool getLonLatZOffset(int ix, int iy, double &lonOffsetRadian, + double &latOffsetRadian, double &zOffset) const { + return getLonLatOffset(ix, iy, lonOffsetRadian, latOffsetRadian) && +>>>>>>> locationtech-main getZOffset(ix, iy, zOffset); } diff --git a/src/transformations/defmodel.hpp b/src/transformations/defmodel.hpp index 5dab2321e5f3..4fb384038f32 100644 --- a/src/transformations/defmodel.hpp +++ b/src/transformations/defmodel.hpp @@ -483,6 +483,7 @@ struct GridPrototype { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -637,6 +638,11 @@ struct GridPrototype { double & /*latOffsetRadian*/) const { throw UnimplementedException("getLonLatOffset unimplemented"); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool getLonLatOffset(int /*ix*/, int /*iy*/, double & /*lonOffsetRadian*/, + double & /*latOffsetRadian*/) const { + throw UnimplementedException("getLonLatOffset unimplemented"); +>>>>>>> locationtech-main } // cppcheck-suppress functionStatic @@ -659,6 +665,7 @@ struct GridPrototype { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -750,6 +757,8 @@ struct GridPrototype { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main bool getLonLatZOffset(int /*ix*/, int /*iy*/, double & /*lonOffsetRadian*/, double & /*latOffsetRadian*/, double & /*zOffset*/) const { @@ -762,6 +771,7 @@ struct GridPrototype { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -865,6 +875,8 @@ struct GridPrototype { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main getZOffset(ix, iy, zOffset); #endif } diff --git a/src/transformations/defmodel_impl.hpp b/src/transformations/defmodel_impl.hpp index 5314d44e090e..8aefe32fb236 100644 --- a/src/transformations/defmodel_impl.hpp +++ b/src/transformations/defmodel_impl.hpp @@ -1004,6 +1004,7 @@ bool Evaluator::forward( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1092,6 +1093,8 @@ bool Evaluator::forward( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!grid->getLonLatOffset(ix0, iy0, dx00, dy00) || !grid->getLonLatOffset(ix1, iy0, dx10, dy10) || !grid->getLonLatOffset(ix0, iy1, dx01, dy01) || @@ -1102,6 +1105,7 @@ bool Evaluator::forward( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1198,6 +1202,8 @@ bool Evaluator::forward( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return false; } } else /* if (compEx->displacementType == DisplacementType::THREE_D) @@ -1214,6 +1220,7 @@ bool Evaluator::forward( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1302,6 +1309,8 @@ bool Evaluator::forward( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (!grid->getLonLatZOffset(ix0, iy0, dx00, dy00, dz00) || !grid->getLonLatZOffset(ix1, iy0, dx10, dy10, dz10) || !grid->getLonLatZOffset(ix0, iy1, dx01, dy01, dz01) || @@ -1312,6 +1321,7 @@ bool Evaluator::forward( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1408,6 +1418,8 @@ bool Evaluator::forward( >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return false; } const double dzInterp = diff --git a/src/transformations/gridshift.cpp b/src/transformations/gridshift.cpp index d6ffa69884eb..0e9ed9b80ce0 100644 --- a/src/transformations/gridshift.cpp +++ b/src/transformations/gridshift.cpp @@ -58,6 +58,7 @@ struct GridInfo { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -131,6 +132,8 @@ struct GridInfo { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main int idxSampleLon = -1; int idxSampleZ = -1; bool bilinearInterpolation = true; @@ -142,6 +145,7 @@ struct GridInfo { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -251,6 +255,8 @@ struct GridInfo { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main int lastIdxLam = -1; int lastIdxPhi = -1; }; @@ -392,6 +398,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -514,6 +521,9 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, ======= int idxSampleLon = -1; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + int idxSampleLon = -1; +>>>>>>> locationtech-main int idxSampleZ = -1; for (int i = 0; i < samplesPerPixel; i++) { const auto desc = grid->description(i); @@ -533,6 +543,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -678,6 +689,10 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, idxSampleLon = i; const auto unit = grid->unit(idxSampleLon); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + idxSampleLon = i; + const auto unit = grid->unit(idxSampleLon); +>>>>>>> locationtech-main if (!unit.empty() && unit != "arc-second") { pj_log(ctx, PJ_LOG_ERROR, "gridshift: Only unit=arc-second currently handled"); @@ -702,6 +717,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -870,6 +886,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main if (samplesPerPixel >= 2 && idxSampleLat < 0 && idxSampleLon < 0 && type == "HORIZONTAL_OFFSET") { idxSampleLat = 0; @@ -879,6 +897,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, if (idxSampleLat < 0 || idxSampleLon < 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -901,6 +920,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main pj_log(ctx, PJ_LOG_ERROR, "gridshift: grid has not expected samples"); return val; @@ -938,6 +959,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1060,6 +1082,9 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, ======= gridInfo.idxSampleLon = idxSampleLon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + gridInfo.idxSampleLon = idxSampleLon; +>>>>>>> locationtech-main gridInfo.idxSampleZ = m_skip_z_transform ? -1 : idxSampleZ; gridInfo.bilinearInterpolation = (interpolation == "bilinear" || grid->width() < 3 || @@ -1072,6 +1097,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1226,6 +1252,11 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, gridInfo.idxSampleLatLonZ[1] = idxSampleLon; gridInfo.idxSampleLatLonZ[2] = idxSampleZ; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + gridInfo.idxSampleLatLonZ[0] = idxSampleLat; + gridInfo.idxSampleLatLonZ[1] = idxSampleLon; + gridInfo.idxSampleLatLonZ[2] = idxSampleZ; +>>>>>>> locationtech-main m_cacheGridInfo[grid] = gridInfo; iterCache = m_cacheGridInfo.find(grid); } @@ -1238,6 +1269,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1360,6 +1392,9 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, ======= const int idxSampleLon = gridInfo.idxSampleLon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const int idxSampleLon = gridInfo.idxSampleLon; +>>>>>>> locationtech-main const int idxSampleZ = gridInfo.idxSampleZ; const bool bilinearInterpolation = gridInfo.bilinearInterpolation; @@ -1410,6 +1445,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1532,6 +1568,9 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, ======= constexpr double convFactorLatLon = 1. / 3600 / 180 * M_PI; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + constexpr double convFactorLatLon = 1. / 3600 / 180 * M_PI; +>>>>>>> locationtech-main if (bilinearInterpolation) { double m10 = frct.lam; double m11 = m10; @@ -1549,6 +1588,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1671,6 +1711,9 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, ======= if (idxSampleLon >= 0 && idxSampleLat >= 0) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (idxSampleLon >= 0 && idxSampleLat >= 0) { +>>>>>>> locationtech-main if (gridInfo.lastIdxPhi != indx.phi || gridInfo.lastIdxLam != indx.lam) { if (!grid->valuesAt(indx.lam, indx.phi, 2, 2, @@ -1682,6 +1725,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1804,6 +1848,9 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, ======= gridInfo.idxSampleLatLonZ.data(), >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + gridInfo.idxSampleLatLonZ.data(), +>>>>>>> locationtech-main gridInfo.shifts.data())) { return val; } @@ -1821,6 +1868,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1894,6 +1942,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main convFactorLatLon; val.lam = (m00 * gridInfo.shifts[1] + m10 * gridInfo.shifts[4] + @@ -1905,6 +1955,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2014,6 +2065,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main val.z = m00 * gridInfo.shifts[2] + m10 * gridInfo.shifts[5] + m01 * gridInfo.shifts[8] + m11 * gridInfo.shifts[11]; } else { @@ -2027,6 +2080,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2100,6 +2154,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main convFactorLatLon; val.lam = (m00 * gridInfo.shifts[1] + m10 * gridInfo.shifts[3] + @@ -2111,6 +2167,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2220,6 +2277,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } } else { val.lam = 0; @@ -2273,6 +2332,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2395,6 +2455,9 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, ======= if (idxSampleLon >= 0 && idxSampleLat >= 0) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + if (idxSampleLon >= 0 && idxSampleLat >= 0) { +>>>>>>> locationtech-main if (gridInfo.lastIdxPhi != indx.phi || gridInfo.lastIdxLam != indx.lam) { if (!grid->valuesAt(indx.lam, indx.phi, 3, 3, @@ -2406,6 +2469,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2528,6 +2592,9 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, ======= gridInfo.idxSampleLatLonZ.data(), >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + gridInfo.idxSampleLatLonZ.data(), +>>>>>>> locationtech-main gridInfo.shifts.data())) { return val; } @@ -2556,6 +2623,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2629,6 +2697,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main convFactorLatLon; val.lam = quadraticInterpol(frct.phi, latlonz_shift[0][1], latlonz_shift[1][1], @@ -2640,6 +2710,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2749,6 +2820,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main val.z = quadraticInterpol(frct.phi, latlonz_shift[0][2], latlonz_shift[1][2], latlonz_shift[2][2]); @@ -2771,6 +2844,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2844,6 +2918,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main convFactorLatLon; val.lam = quadraticInterpol(frct.phi, latlon_shift[0][1], @@ -2855,6 +2931,7 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2964,6 +3041,8 @@ PJ_LPZ gridshiftData::grid_interpolate(PJ_CONTEXT *ctx, const std::string &type, >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } } else { val.lam = 0; @@ -3005,6 +3084,7 @@ static PJ_LP normalizeLongitude(const GenericShiftGrid *grid, const PJ_LPZ in, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3291,6 +3371,9 @@ static PJ_LP normalizeLongitude(const GenericShiftGrid *grid, const PJ_LPZ in, ======= const osgeo::proj::ExtentAndRes *&extentOut) { >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const NS_PROJ::ExtentAndRes *&extentOut) { +>>>>>>> locationtech-main PJ_LP normalized; normalized.lam = in.lam; normalized.phi = in.phi; @@ -3327,6 +3410,7 @@ PJ_LPZ gridshiftData::grid_apply_internal( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3613,6 +3697,9 @@ PJ_LPZ gridshiftData::grid_apply_internal( ======= const osgeo::proj::ExtentAndRes *extent; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + const NS_PROJ::ExtentAndRes *extent; +>>>>>>> locationtech-main PJ_LP normalized_in = normalizeLongitude(grid, in, extent); PJ_LPZ shift = grid_interpolate(ctx, type, normalized_in, grid); diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp index 3965ff40e8bf..251319d572a7 100644 --- a/src/transformations/helmert.cpp +++ b/src/transformations/helmert.cpp @@ -458,6 +458,7 @@ static void helmert_forward_4d (PJ_COORD &point, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -570,6 +571,8 @@ static void helmert_forward_4d (PJ_COORD &point, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning // "Overlapping read/write of union is undefined behavior" @@ -581,6 +584,7 @@ static void helmert_forward_4d (PJ_COORD &point, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -827,6 +831,8 @@ static void helmert_forward_4d (PJ_COORD &point, PJ *P) { ======= point.xyz = helmert_forward_3d (point.lpz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } @@ -850,6 +856,7 @@ static void helmert_reverse_4d (PJ_COORD& point, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -962,6 +969,8 @@ static void helmert_reverse_4d (PJ_COORD& point, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning // "Overlapping read/write of union is undefined behavior" @@ -973,6 +982,7 @@ static void helmert_reverse_4d (PJ_COORD& point, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1219,6 +1229,8 @@ static void helmert_reverse_4d (PJ_COORD& point, PJ *P) { ======= point.lpz = helmert_reverse_3d (point.xyz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } /* Arcsecond to radians */ diff --git a/src/transformations/hgridshift.cpp b/src/transformations/hgridshift.cpp index 90d7baa1471e..6b776a2ac93b 100644 --- a/src/transformations/hgridshift.cpp +++ b/src/transformations/hgridshift.cpp @@ -83,6 +83,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -195,6 +196,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning // "Overlapping read/write of union is undefined behavior" @@ -206,6 +209,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -452,6 +456,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { ======= coo.xyz = forward_3d (coo.lpz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return; } @@ -464,6 +470,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -576,6 +583,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main if (coo.lpzt.t < Q->t_epoch && Q->t_final > Q->t_epoch) { // Assigning in 2 steps avoids cppcheck warning @@ -589,6 +598,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -845,6 +855,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { if (coo.lpzt.t < Q->t_epoch && Q->t_final > Q->t_epoch) coo.xyz = forward_3d (coo.lpz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } static void reverse_4d(PJ_COORD& coo, PJ *P) { @@ -860,6 +872,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -972,6 +985,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning // "Overlapping read/write of union is undefined behavior" @@ -983,6 +998,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1229,6 +1245,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { ======= coo.lpz = reverse_3d (coo.xyz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return; } @@ -1241,6 +1259,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1353,6 +1372,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main if (coo.lpzt.t < Q->t_epoch && Q->t_final > Q->t_epoch) { // Assigning in 2 steps avoids cppcheck warning @@ -1366,6 +1387,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1622,6 +1644,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { if (coo.lpzt.t < Q->t_epoch && Q->t_final > Q->t_epoch) coo.lpz = reverse_3d (coo.xyz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } static PJ *destructor (PJ *P, int errlev) { diff --git a/src/transformations/molodensky.cpp b/src/transformations/molodensky.cpp index 74179b717e64..101a3c9aa6d5 100644 --- a/src/transformations/molodensky.cpp +++ b/src/transformations/molodensky.cpp @@ -223,6 +223,7 @@ static PJ_XY forward_2d(PJ_LP lp, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -517,6 +518,11 @@ static PJ_XY forward_2d(PJ_LP lp, PJ *P) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // Assigning in 2 steps avoids cppcheck warning + // "Overlapping read/write of union is undefined behavior" + // Cf https://github.com/OSGeo/PROJ/pull/3527#pullrequestreview-1233332710 +>>>>>>> locationtech-main const auto xyz = forward_3d(point.lpz, P); point.xyz = xyz; @@ -537,6 +543,7 @@ static PJ_LP reverse_2d(PJ_XY xy, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -831,6 +838,11 @@ static PJ_LP reverse_2d(PJ_XY xy, PJ *P) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // Assigning in 2 steps avoids cppcheck warning + // "Overlapping read/write of union is undefined behavior" + // Cf https://github.com/OSGeo/PROJ/pull/3527#pullrequestreview-1233332710 +>>>>>>> locationtech-main const auto lpz = reverse_3d(point.xyz, P); point.lpz = lpz; @@ -873,6 +885,7 @@ static void forward_4d(PJ_COORD& obs, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -985,6 +998,8 @@ static void forward_4d(PJ_COORD& obs, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning // "Overlapping read/write of union is undefined behavior" @@ -996,6 +1011,7 @@ static void forward_4d(PJ_COORD& obs, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1242,6 +1258,8 @@ static void forward_4d(PJ_COORD& obs, PJ *P) { ======= obs.xyz = forward_3d(obs.lpz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } @@ -1280,6 +1298,7 @@ static void reverse_4d(PJ_COORD& obs, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1392,6 +1411,8 @@ static void reverse_4d(PJ_COORD& obs, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning // "Overlapping read/write of union is undefined behavior" @@ -1403,6 +1424,7 @@ static void reverse_4d(PJ_COORD& obs, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1649,6 +1671,8 @@ static void reverse_4d(PJ_COORD& obs, PJ *P) { ======= obs.lpz = reverse_3d(obs.xyz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } diff --git a/src/transformations/vertoffset.cpp b/src/transformations/vertoffset.cpp index e1c30eb843be..747b62e5874c 100644 --- a/src/transformations/vertoffset.cpp +++ b/src/transformations/vertoffset.cpp @@ -61,6 +61,7 @@ static PJ_XYZ forward_3d(PJ_LPZ lpz, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -183,6 +184,9 @@ static PJ_XYZ forward_3d(PJ_LPZ lpz, PJ *P) { ======= // We need to add lam0 (+lon_0) since it is substracted in fwd_prepare(), >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // We need to add lam0 (+lon_0) since it is substracted in fwd_prepare(), +>>>>>>> locationtech-main // which is desirable for map projections, but not // for that method which modifies only the Z component. xyz.x = lpz.lam + P->lam0; diff --git a/src/transformations/vgridshift.cpp b/src/transformations/vgridshift.cpp index 6dac914e0c12..50e1e3e5fa0a 100644 --- a/src/transformations/vgridshift.cpp +++ b/src/transformations/vgridshift.cpp @@ -114,6 +114,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -226,6 +227,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning // "Overlapping read/write of union is undefined behavior" @@ -237,6 +240,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -483,6 +487,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { ======= coo.xyz = forward_3d (coo.lpz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return; } @@ -495,6 +501,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -607,6 +614,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main if (coo.lpzt.t < Q->t_epoch && Q->t_final > Q->t_epoch) { // Assigning in 2 steps avoids cppcheck warning @@ -620,6 +629,7 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -876,6 +886,8 @@ static void forward_4d(PJ_COORD& coo, PJ *P) { if (coo.lpzt.t < Q->t_epoch && Q->t_final > Q->t_epoch) coo.xyz = forward_3d (coo.lpz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } static void reverse_4d(PJ_COORD& coo, PJ *P) { @@ -891,6 +903,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1003,6 +1016,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Assigning in 2 steps avoids cppcheck warning // "Overlapping read/write of union is undefined behavior" @@ -1014,6 +1029,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1260,6 +1276,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { ======= coo.lpz = reverse_3d (coo.xyz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main return; } @@ -1272,6 +1290,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1384,6 +1403,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main if (coo.lpzt.t < Q->t_epoch && Q->t_final > Q->t_epoch) { // Assigning in 2 steps avoids cppcheck warning @@ -1397,6 +1418,7 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1653,6 +1675,8 @@ static void reverse_4d(PJ_COORD& coo, PJ *P) { if (coo.lpzt.t < Q->t_epoch && Q->t_final > Q->t_epoch) coo.lpz = reverse_3d (coo.xyz, P); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } static PJ *destructor (PJ *P, int errlev) { diff --git a/src/wkt2_generated_parser.c b/src/wkt2_generated_parser.c index 43126c379544..27ba92f5495e 100644 --- a/src/wkt2_generated_parser.c +++ b/src/wkt2_generated_parser.c @@ -178,6 +178,7 @@ extern int pj_wkt2_debug; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -393,6 +394,8 @@ extern int pj_wkt2_debug; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main T_CONVERSION = 279, T_METHOD = 280, T_REMARK = 281, @@ -524,6 +527,7 @@ extern int pj_wkt2_debug; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -620,6 +624,8 @@ extern int pj_wkt2_debug; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; #endif @@ -947,6 +953,7 @@ union yyalloc <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1139,6 +1146,8 @@ union yyalloc >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #define YYLAST 2990 /* YYNTOKENS -- Number of terminals. */ @@ -1154,6 +1163,7 @@ union yyalloc #define YYMAXUTOK 403 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -1176,6 +1186,8 @@ union yyalloc >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM @@ -1198,6 +1210,7 @@ static const yytype_uint8 yytranslate[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1272,6 +1285,8 @@ static const yytype_uint8 yytranslate[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 160, 162, 2, 154, 163, 155, 149, 2, 2, 151, 152, 153, 2, 2, 2, 2, 2, 2, 156, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 150, @@ -1284,6 +1299,7 @@ static const yytype_uint8 yytranslate[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1395,6 +1411,8 @@ static const yytype_uint8 yytranslate[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1432,6 +1450,7 @@ static const yytype_uint8 yytranslate[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1554,6 +1573,9 @@ static const yytype_uint8 yytranslate[] = ======= 145, 146, 147, 148 >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + 145, 146, 147, 148 +>>>>>>> locationtech-main }; #if YYDEBUG @@ -1567,6 +1589,7 @@ static const yytype_int16 yyrline[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1725,6 +1748,8 @@ static const yytype_int16 yyrline[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 0, 207, 207, 207, 207, 207, 207, 207, 208, 208, 208, 209, 212, 212, 213, 213, 213, 214, 216, 216, 220, 224, 224, 226, 228, 230, 230, 232, 232, 234, @@ -1801,6 +1826,7 @@ static const yytype_int16 yyrline[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1897,6 +1923,8 @@ static const yytype_int16 yyrline[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; #endif @@ -1917,6 +1945,7 @@ static const char *const yytname[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2019,6 +2048,8 @@ static const char *const yytname[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "\"ORDER\"", "\"ANCHOR\"", "\"CONVERSION\"", "\"METHOD\"", "\"REMARK\"", "\"GEOGCRS\"", "\"BASEGEOGCRS\"", "\"SCOPE\"", "\"AREA\"", "\"BBOX\"", "\"CITATION\"", "\"URI\"", "\"VERTCRS\"", "\"VDATUM\"", "\"GEOIDMODEL\"", @@ -2041,6 +2072,7 @@ static const char *const yytname[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2137,6 +2169,8 @@ static const char *const yytname[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main "\"PROJECTEDCRS\"", "\"PRIMEMERIDIAN\"", "\"GEOGRAPHICCRS\"", "\"TRF\"", "\"VERTICALCRS\"", "\"VERTICALDATUM\"", "\"VRF\"", "\"TIMEDATUM\"", "\"TEMPORALQUANTITY\"", "\"ENGINEERINGDATUM\"", "\"ENGINEERINGCRS\"", @@ -2228,6 +2262,7 @@ static const char *const yytname[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2379,6 +2414,9 @@ static const char *const yytname[] = ======= "cs_unit", "datum_ensemble", "geodetic_datum_ensemble_without_pm", >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "cs_unit", "datum_ensemble", "geodetic_datum_ensemble_without_pm", +>>>>>>> locationtech-main "datum_ensemble_member_list_ellipsoid_accuracy_identifier_list", "opt_separator_datum_ensemble_identifier_list", "vertical_datum_ensemble", @@ -2412,6 +2450,7 @@ static const char *const yytname[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2589,6 +2628,11 @@ static const char *const yytname[] = "datum_anchor_keyword", "datum_anchor_description", "projected_crs", "projected_crs_keyword", "base_geodetic_crs", "base_static_geodetic_crs", >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "opt_separator_datum_anchor_identifier_list", "datum_anchor", + "datum_anchor_keyword", "datum_anchor_description", "projected_crs", + "projected_crs_keyword", "base_geodetic_crs", "base_static_geodetic_crs", +>>>>>>> locationtech-main "opt_separator_pm_ellipsoidal_cs_unit_opt_separator_identifier_list", "base_dynamic_geodetic_crs", "base_static_geographic_crs", "base_dynamic_geographic_crs", "base_geodetic_crs_keyword", @@ -2615,6 +2659,7 @@ static const char *const yytname[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2791,6 +2836,11 @@ static const char *const yytname[] = "parametric_datum", "parametric_datum_keyword", "temporal_crs", "temporal_crs_keyword", "temporal_datum", >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "engineering_datum_keyword", "parametric_crs", "parametric_crs_keyword", + "parametric_datum", "parametric_datum_keyword", "temporal_crs", + "temporal_crs_keyword", "temporal_datum", +>>>>>>> locationtech-main "opt_separator_temporal_datum_end", "temporal_datum_keyword", "temporal_origin", "temporal_origin_keyword", "temporal_origin_description", "calendar", "calendar_keyword", @@ -2873,6 +2923,7 @@ static const yytype_int16 yytoknum[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2948,6 +2999,8 @@ static const yytype_int16 yytoknum[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 395, 396, 397, 398, 399, 400, 401, 402, 403, 46, 69, 49, 50, 51, 43, 45, 58, 84, 90, 91, 40, 93, 41, 44 @@ -2961,6 +3014,7 @@ static const yytype_int16 yytoknum[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3074,6 +3128,8 @@ static const yytype_int16 yytoknum[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) @@ -3085,6 +3141,7 @@ static const yytype_int16 yytoknum[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3207,6 +3264,9 @@ static const yytype_int16 yytoknum[] = ======= #define YYTABLE_NINF (-640) >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +#define YYTABLE_NINF (-640) +>>>>>>> locationtech-main #define yytable_value_is_error(Yyn) \ 0 @@ -3222,6 +3282,7 @@ static const yytype_int16 yypact[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3456,6 +3517,8 @@ static const yytype_int16 yypact[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 2659, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -1231, @@ -3606,6 +3669,7 @@ static const yytype_int16 yypact[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3702,6 +3766,8 @@ static const yytype_int16 yypact[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -3716,6 +3782,7 @@ static const yytype_int16 yydefact[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3950,6 +4017,8 @@ static const yytype_int16 yydefact[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 0, 419, 406, 395, 405, 161, 431, 454, 397, 486, 489, 607, 651, 686, 689, 511, 504, 356, 566, 496, 493, 501, 499, 618, 673, 396, 421, 432, 398, 420, @@ -3964,6 +4033,7 @@ static const yytype_int16 yydefact[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4375,6 +4445,8 @@ static const yytype_int16 yydefact[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 9, 0, 10, 0, 6, 0, 1, 73, 74, 0, 0, 0, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4493,6 +4565,7 @@ static const yytype_int16 yydefact[] = 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD ======= @@ -4511,6 +4584,8 @@ static const yytype_int16 yydefact[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 333, 334, 335, 336, 337, 338, 297, 246, 248, 250, 252, 0, 245, 270, 277, 279, 281, 283, 0, 276, 293, 184, 480, 482, 480, 485, 378, 116, 190, 535, @@ -4535,6 +4610,7 @@ static const yytype_int16 yydefact[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4664,6 +4740,8 @@ static const yytype_int16 yydefact[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; /* YYPGOTO[NTERM-NUM]. */ @@ -4676,6 +4754,7 @@ static const yytype_int16 yypgoto[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4797,6 +4876,8 @@ static const yytype_int16 yypgoto[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main -1231, -1231, -1231, -221, -223, -191, -1231, 299, -194, 335, -1231, -1231, -1231, -1231, -1231, -1231, -232, -333, -653, -11, -776, -637, -1231, -1231, -1231, -1231, -1231, -1231, -1231, -550, @@ -4839,6 +4920,7 @@ static const yytype_int16 yypgoto[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4935,6 +5017,8 @@ static const yytype_int16 yypgoto[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -4947,6 +5031,7 @@ static const yytype_int16 yydefgoto[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5068,6 +5153,8 @@ static const yytype_int16 yydefgoto[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main -1, 37, 38, 39, 235, 620, 237, 880, 238, 470, 239, 240, 419, 420, 241, 348, 242, 243, 894, 589, 503, 590, 504, 695, 890, 591, 809, 969, 592, 810, @@ -5110,6 +5197,7 @@ static const yytype_int16 yydefgoto[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -5206,6 +5294,8 @@ static const yytype_int16 yydefgoto[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -5220,6 +5310,7 @@ static const yytype_int16 yytable[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5639,6 +5730,8 @@ static const yytype_int16 yytable[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 115, 236, 270, 345, 672, 61, 344, 337, 532, 479, 339, 187, 188, 421, 291, 312, 146, 531, 307, 347, 302, 267, 970, 613, 871, 943, 929, 1018, 906, 326, @@ -5827,6 +5920,7 @@ static const yytype_int16 yytable[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6271,6 +6365,8 @@ static const yytype_int16 yytable[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 669, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 681, 0, 0, 0, 0, 0, 614, 616, @@ -6373,6 +6469,7 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD ======= @@ -6391,6 +6488,8 @@ static const yytype_int16 yytable[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1411, 0, 1413, 1415, 0, 1417, 1418, 1420, 0, 1422, 1423, 1424, 1425, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1429, @@ -6413,6 +6512,7 @@ static const yytype_int16 yytable[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -6561,6 +6661,8 @@ static const yytype_int16 yytable[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; static const yytype_int16 yycheck[] = @@ -6572,6 +6674,7 @@ static const yytype_int16 yycheck[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6991,6 +7094,8 @@ static const yytype_int16 yycheck[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 57, 192, 196, 235, 558, 0, 227, 220, 434, 374, 223, 131, 132, 346, 201, 208, 115, 434, 206, 242, 204, 195, 893, 528, 783, 853, 836, 955, 821, 212, @@ -7179,6 +7284,7 @@ static const yytype_int16 yycheck[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7278,6 +7384,8 @@ static const yytype_int16 yycheck[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 557, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 568, -1, -1, -1, -1, -1, 529, 530, @@ -7380,6 +7488,7 @@ static const yytype_int16 yycheck[] = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD ======= @@ -7398,6 +7507,8 @@ static const yytype_int16 yycheck[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1397, -1, 1399, 1400, -1, 1402, 1403, 1404, -1, 1406, 1407, 1408, 1409, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1426, @@ -7420,6 +7531,7 @@ static const yytype_int16 yycheck[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -7683,6 +7795,8 @@ static const yytype_int16 yycheck[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -7696,6 +7810,7 @@ static const yytype_int16 yystos[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7930,6 +8045,8 @@ static const yytype_int16 yystos[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 0, 4, 5, 10, 15, 17, 18, 24, 27, 34, 35, 37, 39, 44, 46, 49, 52, 60, 63, 65, 66, 67, 68, 76, 77, 79, 80, 81, 83, 84, @@ -8080,6 +8197,7 @@ static const yytype_int16 yystos[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8176,6 +8294,8 @@ static const yytype_int16 yystos[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -8188,6 +8308,7 @@ static const yytype_int16 yyr1[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8346,6 +8467,8 @@ static const yytype_int16 yyr1[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 0, 164, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 166, 166, 166, 166, 166, 166, 167, 167, 168, 169, 169, 170, 171, 172, 172, 173, 173, 174, @@ -8422,6 +8545,7 @@ static const yytype_int16 yyr1[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8557,6 +8681,8 @@ static const yytype_int16 yyr1[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -8596,6 +8722,7 @@ static const yytype_int8 yyr2[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8690,6 +8817,8 @@ static const yytype_int8 yyr2[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1, 3, 2, 2, 4, 2, 1, 1, 3, 1, 3, 1, 3, 1, 3, 2, 4, 2, 2, 2, 4, 2, 2, 1, 3, 2, 2, 0, 2, 2, @@ -8704,6 +8833,7 @@ static const yytype_int8 yyr2[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -8821,6 +8951,8 @@ static const yytype_int8 yyr2[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 3, 0, 3, 7, 3, 3, 1, 1, 5, 0, 3, 1, 1, 1, 4, 1, 1, 1, 5, 1, 4, 1, 1, 2, 3, 0, 2, 5, 0, 2, @@ -8835,6 +8967,7 @@ static const yytype_int8 yyr2[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8949,6 +9082,8 @@ static const yytype_int8 yyr2[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1, 1, 1, 0, 2, 3, 5, 4, 1, 1, 10, 1, 1, 1, 1, 1, 1, 7, 0, 3, 5, 3, 3, 9, 7, 9, 1, 1, 1, 1, @@ -8983,6 +9118,7 @@ static const yytype_int8 yyr2[] = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -9100,6 +9236,8 @@ static const yytype_int8 yyr2[] = >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; diff --git a/src/wkt2_generated_parser.h b/src/wkt2_generated_parser.h index 3bd8e61962c4..f153ba2cd8d3 100644 --- a/src/wkt2_generated_parser.h +++ b/src/wkt2_generated_parser.h @@ -78,6 +78,7 @@ extern int pj_wkt2_debug; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -293,6 +294,8 @@ extern int pj_wkt2_debug; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main T_CONVERSION = 279, T_METHOD = 280, T_REMARK = 281, @@ -424,6 +427,7 @@ extern int pj_wkt2_debug; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -520,6 +524,8 @@ extern int pj_wkt2_debug; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main }; #endif diff --git a/src/wkt2_grammar.y b/src/wkt2_grammar.y index f2abf2c2d5e4..0a712deac274 100644 --- a/src/wkt2_grammar.y +++ b/src/wkt2_grammar.y @@ -68,6 +68,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD %token T_ANCHOREPOCH "ANCHOREPOCH"; ======= <<<<<<< HEAD @@ -172,6 +173,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main %token T_CONVERSION "CONVERSION"; %token T_METHOD "METHOD"; %token T_REMARK "REMARK"; @@ -234,6 +237,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -365,6 +369,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main /* WKT2 alternate (longer or shorter) */ %token T_GEODETICCRS "GEODETICCRS"; @@ -929,6 +935,7 @@ axis_direction_except_n_s_cw_ccw_opt_axis_spatial_unit_identifier_list_options: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1017,6 +1024,8 @@ axis_direction_except_n_s_cw_ccw_opt_axis_spatial_unit_identifier_list_options: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main | axis_order opt_separator_identifier_list | axis_order wkt_separator spatial_unit opt_separator_identifier_list | spatial_unit opt_separator_identifier_list @@ -1027,6 +1036,7 @@ axis_direction_except_n_s_cw_ccw_opt_axis_spatial_unit_identifier_list_options: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1123,6 +1133,8 @@ axis_direction_except_n_s_cw_ccw_opt_axis_spatial_unit_identifier_list_options: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main axis_direction_opt_axis_order_identifier_list: @@ -1161,6 +1173,7 @@ axis_direction_except_n_s_cw_ccw_opt_axis_identifier_list_options: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1300,6 +1313,9 @@ axis_direction_except_n_s_cw_ccw_opt_axis_identifier_list_options: ======= | axis_order opt_separator_identifier_list >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + | axis_order opt_separator_identifier_list +>>>>>>> locationtech-main @@ -1316,6 +1332,7 @@ axis_direction_except_n_s_cw_ccw_opt_axis_time_unit_identifier_list_options: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1492,6 +1509,11 @@ axis_direction_except_n_s_cw_ccw_opt_axis_time_unit_identifier_list_options: | axis_order wkt_separator time_unit opt_separator_identifier_list | time_unit opt_separator_identifier_list >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + | axis_order opt_separator_identifier_list + | axis_order wkt_separator time_unit opt_separator_identifier_list + | time_unit opt_separator_identifier_list +>>>>>>> locationtech-main axis_direction_except_n_s_cw_ccw: T_NORTHNORTHEAST @@ -1551,6 +1573,7 @@ axis_order_keyword: T_ORDER <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1699,6 +1722,8 @@ axis_range_meaning_value: T_exact | T_wraparound >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main cs_unit: unit /* @@ -1906,6 +1931,7 @@ geodetic_reference_frame_without_pm: geodetic_reference_frame_keyword <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2028,6 +2054,9 @@ geodetic_reference_frame_without_pm: geodetic_reference_frame_keyword ======= opt_separator_datum_anchor_identifier_list >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + opt_separator_datum_anchor_identifier_list +>>>>>>> locationtech-main right_delimiter geodetic_reference_frame_keyword: T_DATUM | T_TRF | T_GEODETICDATUM @@ -2041,6 +2070,7 @@ datum_name: quoted_latin_text <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2214,12 +2244,15 @@ opt_separator_datum_anchor_identifier_list: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main opt_separator_datum_anchor_identifier_list: | wkt_separator datum_anchor | wkt_separator identifier opt_separator_identifier_list | wkt_separator datum_anchor wkt_separator identifier opt_separator_identifier_list <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -2242,6 +2275,8 @@ opt_separator_datum_anchor_identifier_list: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main datum_anchor: datum_anchor_keyword left_delimiter datum_anchor_description right_delimiter @@ -2257,6 +2292,7 @@ datum_anchor_description: quoted_latin_text <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2390,6 +2426,8 @@ anchor_epoch: unsigned_integer | unsigned_integer period | unsigned_integer peri >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main // Projected CRS projected_crs: projected_crs_keyword left_delimiter crs_name @@ -2540,6 +2578,7 @@ vertical_reference_frame: vertical_reference_frame_keyword left_delimiter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2662,6 +2701,9 @@ vertical_reference_frame: vertical_reference_frame_keyword left_delimiter ======= opt_separator_datum_anchor_identifier_list >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + opt_separator_datum_anchor_identifier_list +>>>>>>> locationtech-main right_delimiter vertical_reference_frame_keyword: T_VDATUM | T_VRF | T_VERTICALDATUM @@ -2688,6 +2730,7 @@ engineering_datum_keyword: T_EDATUM | T_ENGINEERINGDATUM <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2819,6 +2862,8 @@ opt_separator_datum_anchor_identifier_list: >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main // Parametric CRS parametric_crs: parametric_crs_keyword left_delimiter crs_name diff --git a/src/wkt2_parser.cpp b/src/wkt2_parser.cpp index 0291f43409d0..75d3ae7de3c8 100644 --- a/src/wkt2_parser.cpp +++ b/src/wkt2_parser.cpp @@ -90,6 +90,7 @@ static const wkt2_tokens tokens[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD PAIR(ANCHOREPOCH), ======= @@ -195,6 +196,8 @@ static const wkt2_tokens tokens[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main PAIR(CONVERSION), PAIR(METHOD), PAIR(REMARK), PAIR(GEOGCRS), PAIR(BASEGEOGCRS), PAIR(SCOPE), PAIR(AREA), PAIR(BBOX), PAIR(CITATION), PAIR(URI), PAIR(VERTCRS), PAIR(VDATUM), PAIR(GEOIDMODEL), PAIR(COMPOUNDCRS), @@ -220,6 +223,7 @@ static const wkt2_tokens tokens[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -334,6 +338,8 @@ static const wkt2_tokens tokens[] = { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main // CS types PAIR(AFFINE), PAIR(CARTESIAN), PAIR(CYLINDRICAL), PAIR(ELLIPSOIDAL), diff --git a/test/cli/testvarious b/test/cli/testvarious index ce0bf4cb7c35..d0444a522a6e 100755 --- a/test/cli/testvarious +++ b/test/cli/testvarious @@ -940,6 +940,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1072,6 +1073,8 @@ EOF >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main echo "##############################################################" >> ${OUT} echo "Test EPSG:4896 to EPSG:7930" >> ${OUT} @@ -1228,6 +1231,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1422,6 +1426,8 @@ EOF >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main # Done! # do 'diff' with distribution results diff --git a/test/cli/tv_out.dist b/test/cli/tv_out.dist index cf80d88b5c1c..e635105a3637 100644 --- a/test/cli/tv_out.dist +++ b/test/cli/tv_out.dist @@ -462,6 +462,7 @@ Test EPSG:32631 to EPSG:4326 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -589,6 +590,8 @@ Check we allow ellipsoids up to a 0.59% relative difference in size >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main Test EPSG:4896 to EPSG:7930 3496737.2679 743254.4507 5264462.9620 3496737.7857 743254.0394 5264462.6437 2019.0 3496737.2679 743254.4507 5264462.9620 3496737.9401 743253.8861 5264462.5497 2029.0 @@ -669,6 +672,7 @@ program abnormally terminated <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -832,3 +836,5 @@ program abnormally terminated >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 4d9898ba2081..e2aa3b26e340 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -1775,6 +1775,7 @@ expect -0.001790493 -0.000895247 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> locationtech-main ======= @@ -1849,6 +1850,8 @@ expect -0.001790493 -0.000895247 ======= >>>>>>> ba006ad292 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main # Azi, Sph*Ell =============================================================================== @@ -1858,6 +1861,7 @@ expect -0.001790493 -0.000895247 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) @@ -2189,6 +2193,8 @@ expect -0.001790493 -0.000895247 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main # Tests the equatorial aspect of the projection. ------------------------------------------------------------------------------- operation +proj=gnom +R=1 @@ -2240,6 +2246,7 @@ expect 0 90 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2353,6 +2360,8 @@ expect 0 90 >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ------------------------------------------------------------------------------- operation +proj=gnom +a=1 +rf=200 ------------------------------------------------------------------------------- @@ -2402,6 +2411,7 @@ expect 0 90 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2630,6 +2640,8 @@ expect 0 90 >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main ------------------------------------------------------------------------------- # Test the northern polar aspect of the gnonomic projection @@ -2657,6 +2669,7 @@ expect failure errno coord_transfm_outside_projection_domain <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2770,6 +2783,8 @@ expect failure errno coord_transfm_outside_projection_domain >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main operation +proj=gnom +a=1 +rf=200 +lat_0=90 ------------------------------------------------------------------------------- tolerance 0.1 mm @@ -2796,6 +2811,7 @@ expect failure errno coord_transfm_outside_projection_domain <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3024,6 +3040,8 @@ expect failure errno coord_transfm_outside_projection_domain >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main # Test the southern polar aspect of the gnonomic projection ------------------------------------------------------------------------------- operation +proj=gnom +R=1 +lat_0=-90 @@ -3049,6 +3067,7 @@ expect failure errno coord_transfm_outside_projection_domain <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3162,6 +3181,8 @@ expect failure errno coord_transfm_outside_projection_domain >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main operation +proj=gnom +a=1 +rf=200 +lat_0=-90 ------------------------------------------------------------------------------- tolerance 0.1 mm @@ -3188,6 +3209,7 @@ expect failure errno coord_transfm_outside_projection_domain <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3416,6 +3438,8 @@ expect failure errno coord_transfm_outside_projection_domain >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main # Test the oblique aspect of the gnonomic projection ------------------------------------------------------------------------------- operation +proj=gnom +R=1 +lat_0=45 @@ -3441,6 +3465,7 @@ expect failure errno coord_transfm_outside_projection_domain <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3554,6 +3579,8 @@ expect failure errno coord_transfm_outside_projection_domain >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main ------------------------------------------------------------------------------- operation +proj=gnom +a=1 +rf=200 +lat_0=45 ------------------------------------------------------------------------------- @@ -3577,6 +3604,7 @@ expect failure errno coord_transfm_outside_projection_domain <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3805,6 +3833,8 @@ expect failure errno coord_transfm_outside_projection_domain >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main =============================================================================== # Goode Homolosine # PCyl, Sph. diff --git a/test/gie/deformation.gie b/test/gie/deformation.gie index 5b4d7c641e3f..c0575371f2a2 100644 --- a/test/gie/deformation.gie +++ b/test/gie/deformation.gie @@ -12,6 +12,7 @@ and for testing purposes it doesn't really matter all that much... <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -134,6 +135,9 @@ The input coordinate is located at lon=60, lam=-160 - somewhere in Alaska. ======= The input coordinate is located at lon=60, lam=-160 - somewhere in Alaska. >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +The input coordinate is located at lon=60, lam=-160 - somewhere in Alaska. +>>>>>>> locationtech-main =============================================================================== diff --git a/test/gie/peirce_q.gie b/test/gie/peirce_q.gie index 8f8811d31547..fb85c6cb54b3 100644 --- a/test/gie/peirce_q.gie +++ b/test/gie/peirce_q.gie @@ -16,6 +16,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -138,6 +139,9 @@ ======= # tesselation but means that there is no uniform scale >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +# tesselation but means that there is no uniform scale +>>>>>>> locationtech-main # across the coordinate space, so tolerance can be high. ------------------------------------------------------------ diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index f4f9161a6236..1f5c708d3a78 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -135,6 +135,7 @@ add_executable(proj_test_cpp_api <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test_coordinates.cpp ======= @@ -240,6 +241,8 @@ add_executable(proj_test_cpp_api >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main test_crs.cpp test_metadata.cpp test_io.cpp diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp index 2e7f5585da56..39ce698a8922 100644 --- a/test/unit/gie_self_tests.cpp +++ b/test/unit/gie_self_tests.cpp @@ -1062,6 +1062,7 @@ TEST(gie, proj_trans_generic) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1136,6 +1137,8 @@ TEST(gie, proj_trans_generic) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 120; proj_trans_generic(P, PJ_FWD, &lat, sizeof(double), 1, &lon, sizeof(double), 1, nullptr, 0, 0, nullptr, 0, 0); @@ -1148,6 +1151,7 @@ TEST(gie, proj_trans_generic) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1259,6 +1263,8 @@ TEST(gie, proj_trans_generic) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main proj_destroy(P); } @@ -1353,6 +1359,7 @@ TEST(gie, proj_create_crs_to_crs_from_pj_force_over) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1488,6 +1495,8 @@ TEST(gie, proj_create_crs_to_crs_from_pj_force_over) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main proj_destroy(Pnormalized); proj_destroy(P); @@ -1593,6 +1602,7 @@ TEST(gie, proj_create_crs_to_crs_from_pj_force_over) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1729,6 +1739,8 @@ TEST(gie, proj_create_crs_to_crs_from_pj_force_over) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main proj_destroy(Pnormalized); proj_destroy(P); diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp index 32d00f4ab076..6dba2a27c66a 100644 --- a/test/unit/test_c_api.cpp +++ b/test/unit/test_c_api.cpp @@ -939,6 +939,7 @@ TEST_F(CApi, proj_get_type) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1078,6 +1079,9 @@ TEST_F(CApi, proj_get_type) { ======= ASSERT_EQ(obj, nullptr); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + ASSERT_EQ(obj, nullptr); +>>>>>>> locationtech-main } } @@ -1984,6 +1988,7 @@ TEST_F(CApi, proj_create_operations_prime_meridian_non_greenwich) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2106,6 +2111,9 @@ TEST_F(CApi, proj_create_operations_prime_meridian_non_greenwich) { ======= // lat,lon=49,-4 if using grid >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // lat,lon=49,-4 if using grid +>>>>>>> locationtech-main coord.xy.x = 136555.58288992; coord.xy.y = 463344.51894296; int idx = proj_get_suggested_operation(m_ctxt, res, PJ_FWD, coord); @@ -2928,6 +2936,7 @@ TEST_F(CApi, proj_create_projections) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3050,6 +3059,9 @@ TEST_F(CApi, proj_create_projections) { ======= auto projCRS = proj_create_conversion_tunisia_mapping_grid( >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto projCRS = proj_create_conversion_tunisia_mapping_grid( +>>>>>>> locationtech-main m_ctxt, 0, 0, 0, 0, "Degree", 0.0174532925199433, "Metre", 1.0); ObjectKeeper keeper_projCRS(projCRS); ASSERT_NE(projCRS, nullptr); @@ -5115,6 +5127,7 @@ TEST_F(CApi, proj_create_crs_to_crs_from_pj_ballpark_filter) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -5281,6 +5294,8 @@ TEST_F(CApi, proj_create_crs_to_crs_coordinate_metadata_in_target) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main static void check_axis_is_latitude(PJ_CONTEXT *ctx, PJ *cs, int axis_number, const char *unit_name = "degree", @@ -5928,6 +5943,7 @@ TEST_F(CApi, proj_create_vertical_crs_ex_implied_accuracy) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6050,6 +6066,9 @@ TEST_F(CApi, proj_create_vertical_crs_ex_implied_accuracy) { ======= // Check there's an asssociated area of use >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // Check there's an asssociated area of use +>>>>>>> locationtech-main double west_lon_degree = 0; double south_lat_degree = 0; double east_lon_degree = 0; @@ -6817,6 +6836,7 @@ TEST_F(CApi, proj_trans_bounds_ignore_inf) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -6929,6 +6949,8 @@ TEST_F(CApi, proj_trans_bounds_ignore_inf) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main // Before the ellipsoidal version of the gnomonic projection was // implemented the WGS84 ellipsoid was treated as a sphere of radius @@ -6941,6 +6963,7 @@ TEST_F(CApi, proj_trans_bounds_ignore_inf) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7037,6 +7060,9 @@ TEST_F(CApi, proj_trans_bounds_ignore_inf) { // -89178007.2 which was the projection of lat = -90d/(ndiv+1), lon = 180d. >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= + // -89178007.2 which was the projection of lat = -90d/(ndiv+1), lon = 180d. >>>>>>> locationtech-main // // With the implementation of the ellipsoidal gnonomic projection, the @@ -7049,6 +7075,7 @@ TEST_F(CApi, proj_trans_bounds_ignore_inf) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD // now lat = -90+4.15*ndiv = -2.85d, long = 180d for which y = -116576598.5. ======= @@ -7167,6 +7194,9 @@ TEST_F(CApi, proj_trans_bounds_ignore_inf) { >>>>>>> 6a0b9804ba (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) ======= >>>>>>> 74eac2217b (typo fixes) +>>>>>>> locationtech-main +======= + // now lat = -90+4.15*ndiv = -2.85d, lon = 180d for which y = -116576598.5. >>>>>>> locationtech-main int success = proj_trans_bounds(m_ctxt, P, PJ_FWD, -180.0, -90.0, 180.0, 1.3, @@ -7177,6 +7207,7 @@ TEST_F(CApi, proj_trans_bounds_ignore_inf) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 13395ba73 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) @@ -7521,6 +7552,8 @@ TEST_F(CApi, proj_trans_bounds_ignore_inf) { EXPECT_NEAR(out_left, 0, 1); EXPECT_NEAR(out_bottom, -89178008, 1); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(out_right, 0, 1); EXPECT_NEAR(out_top, 0, 1); } diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp index 5e964c439f48..8a9686d87acd 100644 --- a/test/unit/test_crs.cpp +++ b/test/unit/test_crs.cpp @@ -2625,6 +2625,7 @@ TEST(crs, projectedCRS_identify_db) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2927,6 +2928,11 @@ TEST(crs, projectedCRS_identify_db) { ======= EXPECT_EQ(res.size(), 0U); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + EXPECT_EQ(res.size(), 1U); + EXPECT_EQ(res.front().first->getEPSGCode(), 2172); + EXPECT_EQ(res.front().second, 70); +>>>>>>> locationtech-main } { // Existing code, but not matching content @@ -2949,6 +2955,7 @@ TEST(crs, projectedCRS_identify_db) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3254,6 +3261,10 @@ TEST(crs, projectedCRS_identify_db) { EXPECT_EQ(res.front().first->getEPSGCode(), 32631); EXPECT_EQ(res.front().second, 25); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + EXPECT_EQ(res.front().first->getEPSGCode(), 2172); + EXPECT_EQ(res.front().second, 70); +>>>>>>> locationtech-main } { // Identify by exact name @@ -3880,6 +3891,7 @@ TEST(crs, projectedCRS_identify_db) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3992,6 +4004,8 @@ TEST(crs, projectedCRS_identify_db) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main { // Identify from a pseudo WKT ESRI with has an AUTHORITY node that @@ -4024,6 +4038,7 @@ TEST(crs, projectedCRS_identify_db) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4252,6 +4267,8 @@ TEST(crs, projectedCRS_identify_db) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -8152,6 +8169,7 @@ TEST(crs, projected_is_equivalent_to_with_proj4_extension) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8323,3 +8341,5 @@ TEST(crs, is_dynamic) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main diff --git a/test/unit/test_datum.cpp b/test/unit/test_datum.cpp index 533c23f871fe..1371b3f185e2 100644 --- a/test/unit/test_datum.cpp +++ b/test/unit/test_datum.cpp @@ -255,6 +255,7 @@ TEST(datum, datum_with_ANCHOR) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -385,6 +386,8 @@ TEST(datum, datum_with_ANCHOR) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main auto expected = "DATUM[\"WGS_1984 with anchor\",\n" " ELLIPSOID[\"WGS 84\",6378137,298.257223563,\n" " LENGTHUNIT[\"metre\",1],\n" @@ -403,6 +406,7 @@ TEST(datum, datum_with_ANCHOR) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -555,6 +559,8 @@ TEST(datum, datum_with_ANCHOREPOCH) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(datum, dynamic_geodetic_reference_frame) { auto drf = DynamicGeodeticReferenceFrame::create( PropertyMap().set(IdentifiedObject::NAME_KEY, "test"), Ellipsoid::WGS84, diff --git a/test/unit/test_defmodel.cpp b/test/unit/test_defmodel.cpp index 4ab5bd13ac4a..5c41a425da88 100644 --- a/test/unit/test_defmodel.cpp +++ b/test/unit/test_defmodel.cpp @@ -735,6 +735,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -880,6 +881,10 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { constexpr double lonOffsetQueriedX = 0.01; constexpr double lonOffsetQueriedXp1 = 0.02; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + constexpr double lonOffsetQueriedX = 0.01; + constexpr double lonOffsetQueriedXp1 = 0.02; +>>>>>>> locationtech-main constexpr double latOffsetQueriedY = 0.03; constexpr double latOffsetQueriedYp1 = 0.04; constexpr double zOffsetQueriedXY = 10.; @@ -897,6 +902,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1033,6 +1039,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main bool getLonLatOffset(int ix, int iy, double &lonOffsetRadian, double &latOffsetRadian) const { if (ix == iQueriedX) { @@ -1042,6 +1050,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -1084,6 +1093,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } else { return false; } @@ -1119,6 +1130,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1295,6 +1307,11 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { double &latOffsetRadian, double &zOffset) const { return getLonLatOffset(ix, iy, lonOffsetRadian, latOffsetRadian) && >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + bool getLonLatZOffset(int ix, int iy, double &lonOffsetRadian, + double &latOffsetRadian, double &zOffset) const { + return getLonLatOffset(ix, iy, lonOffsetRadian, latOffsetRadian) && +>>>>>>> locationtech-main getZOffset(ix, iy, zOffset); } @@ -1346,6 +1363,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1468,6 +1486,9 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { ======= double newLon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double newLon; +>>>>>>> locationtech-main double newLat; double newZ; constexpr double tValid = 2018; @@ -1483,6 +1504,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1557,6 +1579,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX; const double lat = gridMinY + iQueriedY * gridResY; EXPECT_TRUE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -1568,6 +1592,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1685,6 +1710,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(RadToDeg(newLat), lat + tFactor * latOffsetQueriedY, EPS); EXPECT_EQ(newZ, zVal); } @@ -1700,6 +1727,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1778,6 +1806,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX + alphaX * gridResX; const double lat = gridMinY + iQueriedY * gridResY + alphaY * gridResY; EXPECT_TRUE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -1793,6 +1823,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1915,6 +1946,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR( RadToDeg(newLat), lat + tFactor * (latOffsetQueriedY + alphaY * (latOffsetQueriedYp1 - @@ -1932,6 +1965,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2004,6 +2038,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = modelMinX - 1e-1; const double lat = gridMinY + iQueriedY * gridResY; EXPECT_FALSE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -2014,6 +2050,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2121,6 +2158,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // Longitude > model max @@ -2132,6 +2171,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2204,6 +2244,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = modelMaxX + 1e-1; const double lat = gridMinY + iQueriedY * gridResY; EXPECT_FALSE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -2214,6 +2256,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2321,6 +2364,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // Latitude < model min @@ -2332,6 +2377,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2404,6 +2450,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX; const double lat = modelMinY - 1e-1; EXPECT_FALSE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -2414,6 +2462,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2521,6 +2570,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // Latitude > model max @@ -2532,6 +2583,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2604,6 +2656,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX; const double lat = modelMaxY + 1e-1; EXPECT_FALSE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -2614,6 +2668,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2721,6 +2776,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // Before timeExtent.first @@ -2732,6 +2789,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2804,6 +2862,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX; const double lat = gridMinY + iQueriedY * gridResY; EXPECT_FALSE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -2814,6 +2874,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2921,6 +2982,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // After timeExtent.last @@ -2932,6 +2995,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3004,6 +3068,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX; const double lat = gridMinY + iQueriedY * gridResY; EXPECT_FALSE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -3014,6 +3080,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3121,6 +3188,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // Longitude < grid min @@ -3132,6 +3201,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3205,6 +3275,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX - 1e-1; const double lat = gridMinY + iQueriedY * gridResY; EXPECT_TRUE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -3216,6 +3288,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3325,6 +3398,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(RadToDeg(newLat), lat, EPS); EXPECT_EQ(newZ, zVal); } @@ -3338,6 +3413,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3411,6 +3487,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMaxX + 1e-1; const double lat = gridMinY + iQueriedY * gridResY; EXPECT_TRUE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -3422,6 +3500,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3531,6 +3610,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(RadToDeg(newLat), lat, EPS); EXPECT_EQ(newZ, zVal); } @@ -3544,6 +3625,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3617,6 +3699,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX; const double lat = gridMinY - 1e-1; EXPECT_TRUE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -3628,6 +3712,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3737,6 +3822,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(RadToDeg(newLat), lat, EPS); EXPECT_EQ(newZ, zVal); } @@ -3750,6 +3837,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3823,6 +3911,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX; const double lat = gridMaxY + 1e-1; EXPECT_TRUE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -3834,6 +3924,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3943,6 +4034,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(RadToDeg(newLat), lat, EPS); EXPECT_EQ(newZ, zVal); } @@ -3956,6 +4049,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4029,6 +4123,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX; const double lat = gridMinY + iQueriedY * gridResY; EXPECT_TRUE(eval.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -4040,6 +4136,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4149,6 +4246,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(RadToDeg(newLat), lat, EPS); EXPECT_EQ(newZ, zVal); } @@ -4168,6 +4267,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4243,6 +4343,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX + alphaX * gridResX; const double lat = gridMinY + iQueriedY * gridResY + alphaY * gridResY; EXPECT_TRUE(evalVertical.forward(iface, DegToRad(lon), DegToRad(lat), @@ -4254,6 +4356,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4373,6 +4476,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(RadToDeg(newLat), lat, EPS); const double zBottom = @@ -4399,6 +4504,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4477,6 +4583,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX + iQueriedX * gridResX + alphaX * gridResX; const double lat = gridMinY + iQueriedY * gridResY + alphaY * gridResY; EXPECT_TRUE(eval3d.forward(iface, DegToRad(lon), DegToRad(lat), zVal, @@ -4492,6 +4600,7 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4614,6 +4723,8 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR( RadToDeg(newLat), lat + tFactor * (latOffsetQueriedY + alphaY * (latOffsetQueriedYp1 - @@ -4835,6 +4946,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4957,6 +5069,9 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { ======= double lon; >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + double lon; +>>>>>>> locationtech-main double lat; double expected_de; double expected_dn; @@ -5001,6 +5116,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5185,6 +5301,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = testPoint.lon; const double lat = testPoint.lat; double newLon; @@ -5198,6 +5316,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { << lon << " " << lat << " " << testPoint.displacement_type <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -5220,6 +5339,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main << testPoint.interpolation_method; double de; @@ -5231,6 +5352,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5455,6 +5577,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main DeltaLongLatToEastingNorthing(DegToRad(lat), newLon - DegToRad(lon), newLat - DegToRad(lat), a, b, de, dn); EXPECT_NEAR(de, tFactor * testPoint.expected_de, 1e-8) @@ -5474,6 +5598,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { EXPECT_EQ(newLon2, newLon); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -5496,6 +5621,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_EQ(newLat2, newLat); EXPECT_EQ(newZ2, newZ); @@ -5507,6 +5634,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5583,6 +5711,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_TRUE(eval.forward(iface, DegToRad(lon - gridResX / 2), DegToRad(lat), zVal, tValid, newLon2, newLat2, newZ2)); @@ -5597,6 +5727,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -5702,6 +5833,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_EQ(newLat2, newLat); EXPECT_EQ(newZ2, newZ); @@ -5713,6 +5846,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -5908,6 +6042,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_TRUE(eval.forward(iface, DegToRad(lon), DegToRad(lat - gridResY / 2), zVal, tValid, newLon2, newLat2, newZ2)); @@ -5918,6 +6054,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { EXPECT_EQ(newLon2, newLon); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -5940,6 +6077,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_EQ(newLat2, newLat); EXPECT_EQ(newZ2, newZ); } @@ -5961,6 +6100,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6170,6 +6310,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = 165.9; const double lat = -37.3; double newLon; @@ -6186,6 +6328,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { EXPECT_NEAR(RadToDeg(invLon), lon, 1e-10); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -6208,6 +6351,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(RadToDeg(invLat), lat, 1e-10); EXPECT_NEAR(invZ, zVal, 1e-4); } @@ -6228,6 +6373,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6369,6 +6515,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main const double lon = gridMinX; const double lat = gridMinY; double newLon; @@ -6379,6 +6527,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 360db021b (Merge pull request #3524 from cffk/merid-update-fix) >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) <<<<<<< HEAD @@ -6421,6 +6570,8 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double de; double dn; @@ -6433,6 +6584,7 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -6572,6 +6724,9 @@ TEST(defmodel, evaluator_horizontal_unit_metre) { ======= DeltaLongLatToEastingNorthing(DegToRad(lat), newLon - DegToRad(lon), >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + DeltaLongLatToEastingNorthing(DegToRad(lat), newLon - DegToRad(lon), +>>>>>>> locationtech-main newLat - DegToRad(lat), a, b, de, dn); EXPECT_NEAR(de, tFactor * expected_de, 1e-10); EXPECT_NEAR(dn, tFactor * expected_dn, 1e-9); diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 778e9016dce5..4426fcae181c 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -40,6 +40,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #include "proj/coordinates.hpp" ======= <<<<<<< HEAD @@ -144,6 +145,8 @@ >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main #include "proj/coordinatesystem.hpp" #include "proj/crs.hpp" #include "proj/datum.hpp" @@ -165,6 +168,7 @@ using namespace osgeo::proj::common; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD using namespace osgeo::proj::coordinates; ======= <<<<<<< HEAD @@ -269,6 +273,8 @@ using namespace osgeo::proj::coordinates; >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main using namespace osgeo::proj::crs; using namespace osgeo::proj::cs; using namespace osgeo::proj::datum; @@ -415,6 +421,7 @@ TEST(wkt_parse, datum_with_ANCHOR) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -581,6 +588,8 @@ TEST(wkt_parse, datum_with_invalid_ANCHOREPOCH_too_many_children) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -1399,6 +1408,7 @@ TEST(wkt_parse, wkt2_geocentric) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1538,6 +1548,9 @@ TEST(wkt_parse, wkt2_geocentric) { ======= " AXIS[\"(X)\",geocentricX,\n" >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + " AXIS[\"(X)\",geocentricX,\n" +>>>>>>> locationtech-main " ORDER[1],\n" " LENGTHUNIT[\"metre\",1,\n" " ID[\"EPSG\",9001]]],\n" @@ -2463,6 +2476,7 @@ TEST(wkt_parse, wkt1_hotine_oblique_mercator_with_rectified_grid_angle) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2585,6 +2599,9 @@ TEST(wkt_parse, wkt1_hotine_oblique_mercator_with_rectified_grid_angle) { ======= // Check that we have not overriden rectified_grid_angle >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // Check that we have not overriden rectified_grid_angle +>>>>>>> locationtech-main auto got_wkt = crs->exportToWKT( WKTFormatter::create(WKTFormatter::Convention::WKT1_GDAL).get()); EXPECT_TRUE(got_wkt.find("PARAMETER[\"rectified_grid_angle\",-23]") != @@ -2623,6 +2640,7 @@ TEST(wkt_parse, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2745,6 +2763,9 @@ TEST(wkt_parse, ======= // Check that we have not overriden rectified_grid_angle >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // Check that we have not overriden rectified_grid_angle +>>>>>>> locationtech-main auto got_wkt = crs->exportToWKT( WKTFormatter::create(WKTFormatter::Convention::WKT1_GDAL).get()); EXPECT_TRUE(got_wkt.find("PARAMETER[\"rectified_grid_angle\",0]") != @@ -3207,6 +3228,7 @@ TEST(wkt_parse, cs_with_multiple_ID) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3545,6 +3567,8 @@ TEST(wkt_parse, cs_with_invalid_RANGEMEANING_too_many_children) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(wkt_parse, vertcrs_WKT2) { auto wkt = "VERTCRS[\"ODN height\",\n" " VDATUM[\"Ordnance Datum Newlyn\"],\n" @@ -3854,6 +3878,7 @@ TEST(wkt_parse, vdatum_with_ANCHOR) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3994,6 +4019,8 @@ TEST(wkt_parse, vdatum_with_ANCHOREPOCH) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -9790,6 +9817,7 @@ TEST(wkt_parse, invalid_DerivedTemporalCRS) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9983,6 +10011,8 @@ TEST(wkt_parse, invalid_CoordinateMetadata) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(io, projstringformatter) { { @@ -11513,6 +11543,7 @@ TEST(io, projparse_cea_spherical) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -11625,6 +11656,8 @@ TEST(io, projparse_cea_spherical) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main const std::string input( "+proj=cea +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +R=6371228 +units=m " @@ -11635,6 +11668,7 @@ TEST(io, projparse_cea_spherical) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -11891,6 +11925,8 @@ TEST(io, projparse_cea_spherical) { auto obj = PROJStringParser().createFromPROJString( "+proj=cea +R=6371228 +type=crs"); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main auto crs = nn_dynamic_pointer_cast(obj); ASSERT_TRUE(crs != nullptr); EXPECT_EQ(crs->derivingConversion()->method()->getEPSGCode(), @@ -11903,6 +11939,7 @@ TEST(io, projparse_cea_spherical) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -12015,6 +12052,8 @@ TEST(io, projparse_cea_spherical) { ======= >>>>>>> 0c3226c442 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= >>>>>>> locationtech-main EXPECT_EQ( crs->exportToPROJString( @@ -12026,6 +12065,7 @@ TEST(io, projparse_cea_spherical) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -12254,6 +12294,8 @@ TEST(io, projparse_cea_spherical) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main auto crs2 = ProjectedCRS::create( PropertyMap(), crs->baseCRS(), @@ -12279,6 +12321,7 @@ TEST(io, projparse_cea_spherical) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -12528,6 +12571,10 @@ TEST(io, projparse_cea_spherical_on_ellipsoid) { >>>>>>> 57d7b62058 (Merge pull request #3523 from rouault/cleanup_aeqd_s_forward) ======= >>>>>>> 9b68b76b81 (Fix build with -DPROJ_INTERNAL_CPP_NAMESPACE) +>>>>>>> locationtech-main +======= +TEST(io, projparse_cea_spherical_on_ellipsoid) { + std::string input("+proj=cea +R_A +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 " >>>>>>> locationtech-main "+ellps=WGS84 +units=m +no_defs +type=crs"); auto obj = PROJStringParser().createFromPROJString(input); @@ -12549,6 +12596,7 @@ TEST(io, projparse_cea_spherical_on_ellipsoid) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -12777,6 +12825,8 @@ TEST(io, projparse_cea_spherical_on_ellipsoid) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(io, projparse_cea_ellipsoidal) { auto obj = PROJStringParser().createFromPROJString( "+proj=cea +ellps=GRS80 +type=crs"); @@ -13409,6 +13459,7 @@ TEST(io, projparse_laea_ellipsoidal) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -13522,6 +13573,8 @@ TEST(io, projparse_laea_ellipsoidal) { >>>>>>> efa88b5285 (Merge pull request #3523 from rouault/cleanup_aeqd_s_forward) >>>>>>> 57d7b62058 (Merge pull request #3523 from rouault/cleanup_aeqd_s_forward) >>>>>>> locationtech-main +======= +>>>>>>> locationtech-main TEST(io, projparse_laea_spherical_on_ellipsoid) { std::string input("+proj=laea +R_A +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 " "+ellps=WGS84 +units=m +no_defs +type=crs"); @@ -13544,6 +13597,7 @@ TEST(io, projparse_laea_spherical_on_ellipsoid) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -13772,6 +13826,8 @@ TEST(io, projparse_laea_spherical_on_ellipsoid) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(io, projparse_eqc_spherical) { auto obj = PROJStringParser().createFromPROJString( "+proj=eqc +R=6371228 +type=crs"); @@ -15112,6 +15168,7 @@ TEST(io, createFromUserInput) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15275,6 +15332,8 @@ TEST(io, createFromUserInput) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main } // --------------------------------------------------------------------------- @@ -15296,6 +15355,7 @@ TEST(io, createFromUserInput_ogc_crs_url) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15439,6 +15499,8 @@ TEST(io, createFromUserInput_ogc_crs_url) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_THROW( createFromUserInput("http://www.opengis.net/def/crs", dbContext), ParsingException); @@ -15458,6 +15520,7 @@ TEST(io, createFromUserInput_ogc_crs_url) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15589,6 +15652,8 @@ TEST(io, createFromUserInput_ogc_crs_url) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main { auto obj = createFromUserInput( "http://www.opengis.net/def/crs-compound?1=http://www.opengis.net/" @@ -16092,6 +16157,7 @@ TEST(json_import, axis_with_meridian_with_unit) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -16299,6 +16365,8 @@ TEST(json_import, axis_with_invalid_range_meaning_number) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(json_import, prime_meridian) { auto json = "{\n" " \"$schema\": \"foo\",\n" @@ -16393,6 +16461,7 @@ TEST(json_import, geodetic_reference_frame_with_explicit_prime_meridian) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -16557,6 +16626,8 @@ TEST(json_import, geodetic_reference_frame_with_invalid_anchor_epoch) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(json_import, dynamic_geodetic_reference_frame_with_implicit_prime_meridian) { auto json = "{\n" @@ -18900,6 +18971,7 @@ TEST(json_import, vertical_crs_with_geoid_model_and_interpolation_crs) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -19043,6 +19115,8 @@ TEST(json_import, vertical_reference_frame_with_anchor_epoch) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(json_import, parametric_crs) { auto json = "{\n" " \"$schema\": \"foo\",\n" @@ -19881,6 +19955,7 @@ TEST(json_export, coordinate_system_id) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -20074,6 +20149,8 @@ TEST(json_import, invalid_CoordinateMetadata) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main TEST(io, EXTENSION_PROJ4) { // Check that the PROJ string is preserved in the remarks auto obj = PROJStringParser().createFromPROJString( diff --git a/test/unit/test_network.cpp b/test/unit/test_network.cpp index 29829950cdc8..390bd5206ea6 100644 --- a/test/unit/test_network.cpp +++ b/test/unit/test_network.cpp @@ -174,6 +174,7 @@ TEST(networking, basic) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -247,6 +248,8 @@ TEST(networking, basic) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2; double lat = 49; proj_trans_generic(P, PJ_FWD, &lon, sizeof(double), 1, &lat, sizeof(double), @@ -258,6 +261,7 @@ TEST(networking, basic) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -367,6 +371,8 @@ TEST(networking, basic) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(lat, 48.9999322600, 1e-10); proj_destroy(P); @@ -743,6 +749,7 @@ TEST(networking, custom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -817,6 +824,8 @@ TEST(networking, custom) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2 / 180. * M_PI; double lat = 49 / 180. * M_PI; double z = 0; @@ -829,6 +838,7 @@ TEST(networking, custom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -940,6 +950,8 @@ TEST(networking, custom) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1U); EXPECT_EQ(z, 1.25); } @@ -995,6 +1007,7 @@ TEST(networking, custom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1069,6 +1082,8 @@ TEST(networking, custom) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2 / 180. * M_PI; double lat = -49 / 180. * M_PI; double z = 0; @@ -1081,6 +1096,7 @@ TEST(networking, custom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1192,6 +1208,8 @@ TEST(networking, custom) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1U); EXPECT_EQ(z, 2.25); } @@ -1219,6 +1237,7 @@ TEST(networking, custom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1293,6 +1312,8 @@ TEST(networking, custom) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2 / 180. * M_PI; double lat = 49 / 180. * M_PI; double z = 0; @@ -1305,6 +1326,7 @@ TEST(networking, custom) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1416,6 +1438,8 @@ TEST(networking, custom) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1U); EXPECT_EQ(z, 1.25); } @@ -1661,6 +1685,7 @@ TEST(networking, simul_read_range_error) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1735,6 +1760,8 @@ TEST(networking, simul_read_range_error) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2 / 180. * M_PI; double lat = 49 / 180. * M_PI; double z = 0; @@ -1747,6 +1774,7 @@ TEST(networking, simul_read_range_error) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -1858,6 +1886,8 @@ TEST(networking, simul_read_range_error) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1U); EXPECT_EQ(z, 1.25); } @@ -1882,6 +1912,7 @@ TEST(networking, simul_read_range_error) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1957,6 +1988,8 @@ TEST(networking, simul_read_range_error) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2 / 180. * M_PI; double lat = -49 / 180. * M_PI; double z = 0; @@ -1970,6 +2003,7 @@ TEST(networking, simul_read_range_error) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2083,6 +2117,8 @@ TEST(networking, simul_read_range_error) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1U); EXPECT_EQ(z, HUGE_VAL); } @@ -2266,6 +2302,7 @@ TEST(networking, simul_file_change_while_opened) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -2340,6 +2377,8 @@ TEST(networking, simul_file_change_while_opened) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2 / 180. * M_PI; double lat = 49 / 180. * M_PI; double z = 0; @@ -2352,6 +2391,7 @@ TEST(networking, simul_file_change_while_opened) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -2463,6 +2503,8 @@ TEST(networking, simul_file_change_while_opened) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main 1U); EXPECT_EQ(z, 1.25); } @@ -2508,6 +2550,7 @@ TEST(networking, curl_hgridshift) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2630,6 +2673,9 @@ TEST(networking, curl_hgridshift) { ======= c.xyz.y = 2; // lon >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c.xyz.y = 2; // lon +>>>>>>> locationtech-main c.xyz.z = 0; c = proj_trans(P, PJ_FWD, c); @@ -2672,6 +2718,7 @@ TEST(networking, curl_vgridshift) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2794,6 +2841,9 @@ TEST(networking, curl_vgridshift) { ======= c.xyz.y = 150; // lon >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c.xyz.y = 150; // lon +>>>>>>> locationtech-main c.xyz.z = 0; c = proj_trans(P, PJ_FWD, c); @@ -2836,6 +2886,7 @@ TEST(networking, curl_vgridshift_vertcon) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2958,6 +3009,9 @@ TEST(networking, curl_vgridshift_vertcon) { ======= c.xyz.y = -80; // lon >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c.xyz.y = -80; // lon +>>>>>>> locationtech-main c.xyz.z = 0; c = proj_trans(P, PJ_FWD, c); @@ -2994,6 +3048,7 @@ TEST(networking, network_endpoint_env_variable) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3116,6 +3171,9 @@ TEST(networking, network_endpoint_env_variable) { ======= c.xyz.y = -80; // lon >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c.xyz.y = -80; // lon +>>>>>>> locationtech-main c.xyz.z = 0; c = proj_trans(P, PJ_FWD, c); putenv(const_cast("PROJ_NETWORK_ENDPOINT=")); @@ -3151,6 +3209,7 @@ TEST(networking, network_endpoint_api) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3273,6 +3332,9 @@ TEST(networking, network_endpoint_api) { ======= c.xyz.y = -80; // lon >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + c.xyz.y = -80; // lon +>>>>>>> locationtech-main c.xyz.z = 0; c = proj_trans(P, PJ_FWD, c); @@ -3454,6 +3516,7 @@ TEST(networking, cache_saturation) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3527,6 +3590,8 @@ TEST(networking, cache_saturation) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2; double lat = 49; proj_trans_generic(P, PJ_FWD, &lon, sizeof(double), 1, &lat, sizeof(double), @@ -3538,6 +3603,7 @@ TEST(networking, cache_saturation) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3647,6 +3713,8 @@ TEST(networking, cache_saturation) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(lat, 48.9999322600, 1e-10); proj_destroy(P); @@ -3707,6 +3775,7 @@ TEST(networking, cache_ttl) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -3780,6 +3849,8 @@ TEST(networking, cache_ttl) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2; double lat = 49; proj_trans_generic(P, PJ_FWD, &lon, sizeof(double), 1, &lat, sizeof(double), @@ -3791,6 +3862,7 @@ TEST(networking, cache_ttl) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -3900,6 +3972,8 @@ TEST(networking, cache_ttl) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(lat, 48.9999322600, 1e-10); proj_destroy(P); @@ -4006,6 +4080,7 @@ TEST(networking, cache_lock) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4079,6 +4154,8 @@ TEST(networking, cache_lock) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 2; double lat = 49; proj_trans_generic(P, PJ_FWD, &lon, sizeof(double), 1, &lat, sizeof(double), @@ -4090,6 +4167,7 @@ TEST(networking, cache_lock) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4199,6 +4277,8 @@ TEST(networking, cache_lock) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(lat, 48.9999322600, 1e-10); proj_destroy(P); @@ -4290,6 +4370,7 @@ TEST(networking, download_whole_files) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4363,6 +4444,8 @@ TEST(networking, download_whole_files) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 12; double lat = 56; double z = 0; @@ -4374,6 +4457,7 @@ TEST(networking, download_whole_files) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4483,6 +4567,8 @@ TEST(networking, download_whole_files) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(z, 36.5909996032715, 1e-10); proj_destroy(P); @@ -4716,6 +4802,7 @@ TEST(networking, file_api) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -4789,6 +4876,8 @@ TEST(networking, file_api) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main double lon = 12; double lat = 56; double z = 0; @@ -4800,6 +4889,7 @@ TEST(networking, file_api) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> locationtech-main ======= >>>>>>> 748ccdbcc6 (Merge pull request #3524 from cffk/merid-update-fix) @@ -4909,6 +4999,8 @@ TEST(networking, file_api) { >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main EXPECT_NEAR(z, 36.5909996032715, 1e-10); proj_destroy(P); diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp index 13060cfa8960..9d4ec8d8dcc8 100644 --- a/test/unit/test_operation.cpp +++ b/test/unit/test_operation.cpp @@ -1462,6 +1462,7 @@ TEST(operation, tmg_export) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1584,6 +1585,9 @@ TEST(operation, tmg_export) { ======= auto conv = Conversion::createTunisiaMappingGrid( >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + auto conv = Conversion::createTunisiaMappingGrid( +>>>>>>> locationtech-main PropertyMap(), Angle(1), Angle(2), Length(3), Length(4)); EXPECT_TRUE(conv->validateParameters().empty()); @@ -1598,6 +1602,7 @@ TEST(operation, tmg_export) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 3771d4aec1 (Merge pull request #3524 from cffk/merid-update-fix) ======= @@ -1743,6 +1748,10 @@ TEST(operation, tmg_export) { "CONVERSION[\"Tunisia Mapping Grid\",\n" " METHOD[\"Tunisia Mapping Grid\",\n" >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "CONVERSION[\"Tunisia Mapping Grid\",\n" + " METHOD[\"Tunisia Mapping Grid\",\n" +>>>>>>> locationtech-main " ID[\"EPSG\",9816]],\n" " PARAMETER[\"Latitude of false origin\",1,\n" " ANGLEUNIT[\"degree\",0.0174532925199433],\n" @@ -1767,6 +1776,7 @@ TEST(operation, tmg_export) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1889,6 +1899,9 @@ TEST(operation, tmg_export) { ======= "PROJECTION[\"Tunisia_Mapping_Grid\"],\n" >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "PROJECTION[\"Tunisia_Mapping_Grid\"],\n" +>>>>>>> locationtech-main "PARAMETER[\"latitude_of_origin\",1],\n" "PARAMETER[\"central_meridian\",2],\n" "PARAMETER[\"false_easting\",3],\n" @@ -2083,6 +2096,7 @@ TEST(operation, lambert_cylindrical_equal_area_spherical_export) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2369,6 +2383,9 @@ TEST(operation, lambert_cylindrical_equal_area_spherical_export) { ======= "+proj=cea +lat_ts=1 +lon_0=2 +x_0=3 +y_0=4"); >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + "+proj=cea +R_A +lat_ts=1 +lon_0=2 +x_0=3 +y_0=4"); +>>>>>>> locationtech-main EXPECT_EQ(conv->exportToWKT(WKTFormatter::create().get()), "CONVERSION[\"Lambert Cylindrical Equal Area (Spherical)\",\n" diff --git a/test/unit/test_operationfactory.cpp b/test/unit/test_operationfactory.cpp index 26a3a66a5050..bf6d2b21d73f 100644 --- a/test/unit/test_operationfactory.cpp +++ b/test/unit/test_operationfactory.cpp @@ -8666,6 +8666,7 @@ TEST_F(derivedGeographicCRS_with_to_wgs84_to_geographicCRS, src_from_wkt2) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8788,6 +8789,9 @@ TEST_F(derivedGeographicCRS_with_to_wgs84_to_geographicCRS, src_from_wkt2) { ======= // will have a lat, lon axis order >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= + // will have a lat, lon axis order +>>>>>>> locationtech-main auto objSrcProj = PROJStringParser().createFromPROJString( "+proj=ob_tran +o_proj=latlon +lat_0=0 +lon_0=180 +o_lat_p=18.0 " "+o_lon_p=-200.0 +ellps=WGS84 +towgs84=1,2,3 +over +type=crs"); diff --git a/travis/install.sh b/travis/install.sh index 171a4b6c3365..89bba06a51f7 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -168,6 +168,7 @@ test_projjson EPSG:5613 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD test_projjson "ITRF2014@2025.0" ======= <<<<<<< HEAD @@ -272,6 +273,8 @@ test_projjson "ITRF2014@2025.0" >>>>>>> locationtech-main ======= >>>>>>> 0a2f6458d1 (Merge pull request #3524 from cffk/merid-update-fix) +======= +>>>>>>> locationtech-main validate_json $TRAVIS_BUILD_DIR/schemas/v0.5/examples/point_motion_operation.json