Skip to content

Commit

Permalink
HERE Data SDK for Java & Scala Release 2.59.2
Browse files Browse the repository at this point in the history
  • Loading branch information
heremaps-bot authored and heremaps-bot committed Jan 29, 2024
1 parent 739fd0d commit 1346c11
Show file tree
Hide file tree
Showing 240 changed files with 512 additions and 1,459 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ The following examples demonstrate how to use the Location Library.

## License

Copyright (C) 2017-2023 HERE Europe B.V.
Copyright (C) 2017-2024 HERE Europe B.V.

Unless otherwise noted in `LICENSE` files, source code files for specific files or directories, the [LICENSE](LICENSE) in the root applies to all content in this repository.
6 changes: 3 additions & 3 deletions data-archive/java/avro-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.here.platform.data.archive</groupId>
<artifactId>data-archive-avro-example</artifactId>
<version>0.0.861</version>
<version>0.0.865</version>
<packaging>jar</packaging>

<!-- Meta information section start -->
Expand All @@ -23,15 +23,15 @@
<connection>scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git</connection>
<developerConnection>scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git</developerConnection>
<url>https://github.com/heremaps/here-workspace-examples-java-scala</url>
<tag>2.58.2</tag>
<tag>2.59.2</tag>
</scm>

<!-- Meta information section end -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>

<sdk-bom.version>2.58.2</sdk-bom.version>
<sdk-bom.version>2.59.2</sdk-bom.version>
<scala.compat.version>2.12</scala.compat.version>
<artifact.wagon.version>2.0.21</artifact.wagon.version>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2023 HERE Europe B.V.
* Copyright (C) 2017-2024 HERE Europe B.V.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2023 HERE Europe B.V.
* Copyright (C) 2017-2024 HERE Europe B.V.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ here.platform.data-client {
# Discovery of baseUrls of various Data APIs like publish, metadata, query, etc.
endpoint-locator {
# Determines which environment to use for the discovery service's endpoints.
# Possible values are: 'here', 'here-dev', 'here-cn', 'here-cn-dev', 'custom', 'local'.
# Possible values are: 'here', 'here-dev', 'custom', 'local'.
discovery-service-env = YOUR_ENVIRONMENT_TYPE
}
}
Expand Down
6 changes: 3 additions & 3 deletions data-archive/java/parquet-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.here.platform.data.archive</groupId>
<artifactId>data-archive-parquet-example</artifactId>
<version>0.0.861</version>
<version>0.0.865</version>
<packaging>jar</packaging>

<!-- Meta information section start -->
Expand All @@ -23,15 +23,15 @@
<connection>scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git</connection>
<developerConnection>scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git</developerConnection>
<url>https://github.com/heremaps/here-workspace-examples-java-scala</url>
<tag>2.58.2</tag>
<tag>2.59.2</tag>
</scm>

<!-- Meta information section end -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>

<sdk-bom.version>2.58.2</sdk-bom.version>
<sdk-bom.version>2.59.2</sdk-bom.version>
<scala.compat.version>2.12</scala.compat.version>
<artifact.wagon.version>2.0.21</artifact.wagon.version>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2023 HERE Europe B.V.
* Copyright (C) 2017-2024 HERE Europe B.V.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2023 HERE Europe B.V.
* Copyright (C) 2017-2024 HERE Europe B.V.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (C) 2019-2023 HERE Europe B.V.
* Copyright (C) 2019-2024 HERE Europe B.V.
* SPDX-License-Identifier: Apache-2.0
*
* This file is based on commit f84938441be49c665595c936ac631c3e5f171bf9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (C) 2019-2023 HERE Europe B.V.
* Copyright (C) 2019-2024 HERE Europe B.V.
* SPDX-License-Identifier: Apache-2.0
*
* This file is based on commit f84938441be49c665595c936ac631c3e5f171bf9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2023 HERE Europe B.V.
* Copyright (C) 2017-2024 HERE Europe B.V.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ here.platform.data-client {
# Discovery of baseUrls of various Data APIs like publish, metadata, query, etc.
endpoint-locator {
# Determines which environment to use for the discovery service's endpoints.
# Possible values are: 'here', 'here-dev', 'here-cn', 'here-cn-dev', 'custom', 'local'.
# Possible values are: 'here', 'here-dev', 'custom', 'local'.
discovery-service-env = YOUR_ENVIRONMENT_TYPE
}
}
Expand Down
6 changes: 3 additions & 3 deletions data-archive/java/sensoris-protobuf-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.here.platform.examples</groupId>
<artifactId>data-archive-sensoris-protobuf-example</artifactId>
<version>0.0.861</version>
<version>0.0.865</version>
<packaging>jar</packaging>

<!-- Meta information section -->
Expand All @@ -25,15 +25,15 @@
<connection>scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git</connection>
<developerConnection>scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git</developerConnection>
<url>https://github.com/heremaps/here-workspace-examples-java-scala</url>
<tag>2.58.2</tag>
<tag>2.59.2</tag>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<artifact.wagon.version>2.0.21</artifact.wagon.version>

<sdk-bom.version>2.58.2</sdk-bom.version>
<sdk-bom.version>2.59.2</sdk-bom.version>
<scala.compat.version>2.12</scala.compat.version>

<avro.version>1.10.0</avro.version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2023 HERE Europe B.V.
* Copyright (C) 2017-2024 HERE Europe B.V.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2023 HERE Europe B.V.
* Copyright (C) 2017-2024 HERE Europe B.V.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ here.platform.data-client {
# Discovery of baseUrls of various Data APIs like publish, metadata, query, etc.
endpoint-locator {
# Determines which environment to use for the discovery service's endpoints.
# Possible values are: 'here', 'here-dev', 'here-cn', 'here-cn-dev', 'custom', 'local'.
# Possible values are: 'here', 'here-dev', 'custom', 'local'.
discovery-service-env = YOUR_ENVIRONMENT_TYPE
}
}
Expand Down
51 changes: 15 additions & 36 deletions data-processing/java/geometry-lifter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ In the commands that follow, replace the variable placeholders with the followin

- `$CATALOG_ID` is your output catalog's ID.
- `$CATALOG_HRN` is your output catalog's `HRN` (returned by the `olp catalog create` command).
- `$HRN_PARTITION` is the platform environment you are in. Specify `here` unless you are
using the HERE platform environment in China, in which case specify `here-cn`.
- `$HRN_PARTITION` is the platform environment you are in. The value should be `here`.
- `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command).
- `$REALM` The ID of your organization, also called a realm. Consult your platform
invitation letter to learn your organization ID.
- `$CATALOG_RIB` is the HRN of the public _HERE Map Content_ catalog in your pipeline configuration ([HERE environment](./config/here/pipeline-config.conf) or [HERE environment in China](./config/here-china/pipeline-config.conf)).
- `$CATALOG_RIB` is the HRN of the public _HERE Map Content_ catalog in your pipeline configuration ([HERE environment](./config/here/pipeline-config.conf)).

> Note:
> We recommend that you set values to variables, so that you can easily copy and execute the following commands.
Expand Down Expand Up @@ -95,16 +94,15 @@ to define the location of a configuration file that contains the catalogs as wel
of the catalogs, to read and write to.

For local runs, a bounding box filter is provided in the
[`config/here/local-application.conf`](config/here/local-application.conf) and [`config/here-china/local-application.conf`](config/here-china/local-application.conf) to
[`config/here/local-application.conf`](config/here/local-application.conf) to
limit the number of partitions to be processed. This speeds up the compilation process. In this
example, we use a bounding box around the cities of Berlin and Beijing for the HERE platform and HERE
platform in China environments, respectively. You can edit the bounding box coordinates to compile a different
example, we use a bounding box around the cities of Berlin.
You can edit the bounding box coordinates to compile a different
partition of HERE Map Content. Make sure you update the layer coverage to reflect the different
geographical region. In order to use this configuration file, you need to use the `-Dconfig.file`
parameter.

Set the environment variable `$PATH_TO_CONFIG_FOLDER` to [`./config/here`](config/here),
for the HERE platform environment in China, use the files in the [`./config/here-china`](config/here-china) directory.
Set the environment variable `$PATH_TO_CONFIG_FOLDER` to [`./config/here`](config/here).

Use all the above settings to run the following command in the [`geometry-lifter`](../geometry-lifter)
directory to run the Geometry Lifter Compiler.
Expand All @@ -120,17 +118,6 @@ mvn compile exec:java \
-Dspark.master=local[*]
```

For the HERE platform environment for China:

```
mvn compile exec:java \
-Dexec.mainClass=com.here.platform.data.processing.example.java.geometry.lifter.Main \
-Dpipeline-config.file=./config/here-china/local-pipeline-config.conf \
-Dpipeline-job.file=./config/here-china/pipeline-job.conf \
-Dconfig.file=./config/here-china/local-application.conf \
-Dspark.master=local[*]
```

After one run, in the HERE platform environment, you can inspect the local catalog with the OLP CLI:

```
Expand All @@ -141,9 +128,6 @@ You should see the following result:

![Local Data Inspector](img/result.png)

The `local inspect` command is not available in the HERE platform environment for China, but you can
download partitions from the local catalog to inspect them manually.

### Run this Compiler as a HERE Platform Pipeline

#### Configure a Project
Expand Down Expand Up @@ -214,8 +198,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB
From the SDK examples directory, open the `data-processing/java/geometry-lifter` project in your
Integrated Development Environment (IDE).

The `compiler/config/here/pipeline-config.conf` (for the HERE platform environment) and
`compiler/config/here-china/pipeline-config.conf` (for the HERE platform environment in China) files contain
The `compiler/config/here/pipeline-config.conf` files contain
the permanent configuration of the data sources for the compiler.

Pick the file that corresponds to your platform environment. For example, the pipeline configuration for
Expand All @@ -231,17 +214,15 @@ pipeline.config {
```

Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your lifted geometry catalog.
To find the HRN, in the [HERE platform portal](https://platform.here.com/) or the
[HERE platform portal in China](https://platform.hereolp.cn/), navigate to your catalog. The HRN is displayed in the upper
left corner of the page.
To find the HRN, in the [HERE platform portal](https://platform.here.com/), navigate to your catalog.
The HRN is displayed in the upper left corner of the page.

The `config/here/pipeline-job.conf` and `config/here-china/pipeline-job.conf` files
The `config/here/pipeline-job.conf` file
contain the compiler's run configuration.

In this file, modify `version = 1` to reflect the version of the HERE Map Content catalog you want
to process. To find the version of the HERE Map Content catalog, in the
[HERE platform](https://platform.here.com/) or the
[HERE platform portal in China](https://platform.hereolp.cn/),
[HERE platform](https://platform.here.com/),
navigate to the HERE Map Content catalog, and view the current catalog's version in the Catalog info section.

The remainder of the configuration is specified in the `application.conf` file that can be found in the
Expand All @@ -260,8 +241,7 @@ mvn -Pplatform package
#### Deploy the Compiler to a Pipeline

Once the previous command is finished, your JAR is then available at the `target` directory, and you
can upload it using the [HERE pipelines UI](https://platform.here.com/pipelines) (the
[HERE pipelines UI](https://platform.hereolp.cn/pipelines) in China)
can upload it using the [HERE pipelines UI](https://platform.here.com/pipelines)
or the [OLP CLI](https://developer.here.com/documentation/open-location-platform-cli).

You can use the OLP CLI to create pipeline components and activate the pipeline version with the following commands:
Expand All @@ -270,8 +250,7 @@ You can use the OLP CLI to create pipeline components and activate the pipeline

For this example, a bounding box filter is provided by `--runtime-config` parameter to
limit the number of partitions to be processed. This speeds up the compilation process. In this
example, we use a bounding box around the cities of Berlin and Beijing for the HERE platform and HERE
platform in China environments respectively. You can edit the bounding box coordinates to compile a different
example, we use a bounding box around the cities of Berlin. You can edit the bounding box coordinates to compile a different
partition of HERE Map Content. Make sure you update the layer coverage to reflect the different
geographical region.

Expand Down Expand Up @@ -302,12 +281,12 @@ olp pipeline version activate $PIPELINE_ID $PIPELINE_VERSION_ID \
You do not have to specify the input catalog's version, unless you want
to. The latest version will be automatically used.

In the [HERE platform portal](https://platform.here.com/pipelines) / [HERE platform portal in China](https://platform.hereolp.cn/pipelines)
In the [HERE platform portal](https://platform.here.com/pipelines)
navigate to your pipeline to see its status.

## Verify the Output

In the [HERE platform portal](https://platform.here.com/) / [HERE platform portal in China](https://platform.hereolp.cn/),
In the [HERE platform portal](https://platform.here.com/),
select the **Data** tab and find your catalog.

1. Open the `lifted-topology-geometry` layer and select the **Inspect** tab.
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions data-processing/java/geometry-lifter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.here.platform.data.processing.example.java.geometry.lifter</groupId>
<artifactId>geometry-lifter</artifactId>
<version>0.0.861</version>
<version>0.0.865</version>
<packaging>jar</packaging>

<name>Batch Processor compiler for Geometry Lifter in Java</name>
Expand All @@ -23,14 +23,14 @@
<connection>scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git</connection>
<developerConnection>scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git</developerConnection>
<url>https://github.com/heremaps/here-workspace-examples-java-scala</url>
<tag>2.58.2</tag>
<tag>2.59.2</tag>
</scm>

<properties>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<sdk-bom.version>2.58.2</sdk-bom.version>
<sdk-bom.version>2.59.2</sdk-bom.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
<scala-maven-plugin.version>4.5.4</scala-maven-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2023 HERE Europe B.V.
* Copyright (C) 2017-2024 HERE Europe B.V.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit 1346c11

Please sign in to comment.