diff --git a/README.md b/README.md index 4e1365bd4..01f103449 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/data-archive/java/avro-example/pom.xml b/data-archive/java/avro-example/pom.xml index b93453f9d..6a6f68542 100644 --- a/data-archive/java/avro-example/pom.xml +++ b/data-archive/java/avro-example/pom.xml @@ -4,7 +4,7 @@ com.here.platform.data.archive data-archive-avro-example - 0.0.861 + 0.0.865 jar @@ -23,7 +23,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 @@ -31,7 +31,7 @@ UTF-8 1.8 - 2.58.2 + 2.59.2 2.12 2.0.21 diff --git a/data-archive/java/avro-example/src/main/java/com/here/platform/data/archive/example/AvroMultiKeysExample.java b/data-archive/java/avro-example/src/main/java/com/here/platform/data/archive/example/AvroMultiKeysExample.java index 040ff8916..c4d13ed50 100644 --- a/data-archive/java/avro-example/src/main/java/com/here/platform/data/archive/example/AvroMultiKeysExample.java +++ b/data-archive/java/avro-example/src/main/java/com/here/platform/data/archive/example/AvroMultiKeysExample.java @@ -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 diff --git a/data-archive/java/avro-example/src/main/java/com/here/platform/data/archive/example/Main.java b/data-archive/java/avro-example/src/main/java/com/here/platform/data/archive/example/Main.java index cf499192e..356ab30c1 100644 --- a/data-archive/java/avro-example/src/main/java/com/here/platform/data/archive/example/Main.java +++ b/data-archive/java/avro-example/src/main/java/com/here/platform/data/archive/example/Main.java @@ -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. diff --git a/data-archive/java/avro-example/src/main/resources/application.conf b/data-archive/java/avro-example/src/main/resources/application.conf index 3460502f6..b2b082ba1 100644 --- a/data-archive/java/avro-example/src/main/resources/application.conf +++ b/data-archive/java/avro-example/src/main/resources/application.conf @@ -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 } } diff --git a/data-archive/java/parquet-example/pom.xml b/data-archive/java/parquet-example/pom.xml index d026da6f2..aa76ec7b5 100644 --- a/data-archive/java/parquet-example/pom.xml +++ b/data-archive/java/parquet-example/pom.xml @@ -4,7 +4,7 @@ com.here.platform.data.archive data-archive-parquet-example - 0.0.861 + 0.0.865 jar @@ -23,7 +23,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 @@ -31,7 +31,7 @@ UTF-8 1.8 - 2.58.2 + 2.59.2 2.12 2.0.21 diff --git a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/Main.java b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/Main.java index cf499192e..356ab30c1 100644 --- a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/Main.java +++ b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/Main.java @@ -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. diff --git a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/ParquetSimpleKeyExample.java b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/ParquetSimpleKeyExample.java index f8a2c9c77..ef7d149ea 100644 --- a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/ParquetSimpleKeyExample.java +++ b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/ParquetSimpleKeyExample.java @@ -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 diff --git a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/CustomProtoSchemaConverter.java b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/CustomProtoSchemaConverter.java index 310ddbbad..4c659dfc5 100644 --- a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/CustomProtoSchemaConverter.java +++ b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/CustomProtoSchemaConverter.java @@ -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 diff --git a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/CustomProtoWriteSupport.java b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/CustomProtoWriteSupport.java index d59a14fae..d441dc1e6 100644 --- a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/CustomProtoWriteSupport.java +++ b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/CustomProtoWriteSupport.java @@ -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 diff --git a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/SdiiMessageParquetWriterBuilder.java b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/SdiiMessageParquetWriterBuilder.java index 2099bf62a..6fd35539f 100644 --- a/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/SdiiMessageParquetWriterBuilder.java +++ b/data-archive/java/parquet-example/src/main/java/com/here/platform/data/archive/example/util/SdiiMessageParquetWriterBuilder.java @@ -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. diff --git a/data-archive/java/parquet-example/src/main/resources/application.conf b/data-archive/java/parquet-example/src/main/resources/application.conf index 3372e77e8..ebee439e1 100644 --- a/data-archive/java/parquet-example/src/main/resources/application.conf +++ b/data-archive/java/parquet-example/src/main/resources/application.conf @@ -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 } } diff --git a/data-archive/java/sensoris-protobuf-example/pom.xml b/data-archive/java/sensoris-protobuf-example/pom.xml index 06a825445..6ae2678ca 100644 --- a/data-archive/java/sensoris-protobuf-example/pom.xml +++ b/data-archive/java/sensoris-protobuf-example/pom.xml @@ -4,7 +4,7 @@ com.here.platform.examples data-archive-sensoris-protobuf-example - 0.0.861 + 0.0.865 jar @@ -25,7 +25,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 @@ -33,7 +33,7 @@ 1.8 2.0.21 - 2.58.2 + 2.59.2 2.12 1.10.0 diff --git a/data-archive/java/sensoris-protobuf-example/src/main/java/com/here/platform/data/archive/example/Main.java b/data-archive/java/sensoris-protobuf-example/src/main/java/com/here/platform/data/archive/example/Main.java index cf499192e..356ab30c1 100644 --- a/data-archive/java/sensoris-protobuf-example/src/main/java/com/here/platform/data/archive/example/Main.java +++ b/data-archive/java/sensoris-protobuf-example/src/main/java/com/here/platform/data/archive/example/Main.java @@ -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. diff --git a/data-archive/java/sensoris-protobuf-example/src/main/java/com/here/platform/data/archive/example/SensorisProtobufSplittedUDFExample.java b/data-archive/java/sensoris-protobuf-example/src/main/java/com/here/platform/data/archive/example/SensorisProtobufSplittedUDFExample.java index fc2f01a21..349f8745b 100644 --- a/data-archive/java/sensoris-protobuf-example/src/main/java/com/here/platform/data/archive/example/SensorisProtobufSplittedUDFExample.java +++ b/data-archive/java/sensoris-protobuf-example/src/main/java/com/here/platform/data/archive/example/SensorisProtobufSplittedUDFExample.java @@ -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. diff --git a/data-archive/java/sensoris-protobuf-example/src/main/resources/application.conf b/data-archive/java/sensoris-protobuf-example/src/main/resources/application.conf index 02d8730b5..efff81112 100644 --- a/data-archive/java/sensoris-protobuf-example/src/main/resources/application.conf +++ b/data-archive/java/sensoris-protobuf-example/src/main/resources/application.conf @@ -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 } } diff --git a/data-processing/java/geometry-lifter/README.md b/data-processing/java/geometry-lifter/README.md index ce824b837..6480aeda3 100644 --- a/data-processing/java/geometry-lifter/README.md +++ b/data-processing/java/geometry-lifter/README.md @@ -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. @@ -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. @@ -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: ``` @@ -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 @@ -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 @@ -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 @@ -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: @@ -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. @@ -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. diff --git a/data-processing/java/geometry-lifter/config/here-china/local-application.conf b/data-processing/java/geometry-lifter/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/java/geometry-lifter/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/java/geometry-lifter/config/here-china/local-pipeline-config.conf b/data-processing/java/geometry-lifter/config/here-china/local-pipeline-config.conf deleted file mode 100644 index fab2899be..000000000 --- a/data-processing/java/geometry-lifter/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::geometry-lifter-java" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/geometry-lifter/config/here-china/pipeline-config.conf b/data-processing/java/geometry-lifter/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/java/geometry-lifter/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/geometry-lifter/config/here-china/pipeline-job.conf b/data-processing/java/geometry-lifter/config/here-china/pipeline-job.conf deleted file mode 100644 index 71f720be2..000000000 --- a/data-processing/java/geometry-lifter/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - rib { - processing-type = "reprocess" - version = 0 - } - } -} diff --git a/data-processing/java/geometry-lifter/pom.xml b/data-processing/java/geometry-lifter/pom.xml index adb792f4d..f7c333b61 100644 --- a/data-processing/java/geometry-lifter/pom.xml +++ b/data-processing/java/geometry-lifter/pom.xml @@ -4,7 +4,7 @@ com.here.platform.data.processing.example.java.geometry.lifter geometry-lifter - 0.0.861 + 0.0.865 jar Batch Processor compiler for Geometry Lifter in Java @@ -23,14 +23,14 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 1.8 ${java.version} ${java.version} - 2.58.2 + 2.59.2 1.6.0 3.2.1 4.5.4 diff --git a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Compiler.java b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Compiler.java index 51704480f..d1cb722bd 100644 --- a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Compiler.java +++ b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Compiler.java @@ -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. diff --git a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/CompilerConfig.java b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/CompilerConfig.java index d7539e3df..5897705ac 100644 --- a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/CompilerConfig.java +++ b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/CompilerConfig.java @@ -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. diff --git a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Defs.java b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Defs.java index 52a53a940..d4c847332 100644 --- a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Defs.java +++ b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Defs.java @@ -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. diff --git a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/IntermediateData.java b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/IntermediateData.java index 2a2eb315c..738cb5b15 100644 --- a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/IntermediateData.java +++ b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/IntermediateData.java @@ -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. diff --git a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Main.java b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Main.java index 889291b00..5085bfbc5 100644 --- a/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Main.java +++ b/data-processing/java/geometry-lifter/src/main/java/com/here/platform/data/processing/example/java/geometry/lifter/Main.java @@ -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. diff --git a/data-processing/java/heremapcontent-difftool/README.md b/data-processing/java/heremapcontent-difftool/README.md index cdd19b05c..3a95afbbd 100644 --- a/data-processing/java/heremapcontent-difftool/README.md +++ b/data-processing/java/heremapcontent-difftool/README.md @@ -38,12 +38,11 @@ For more details on how to verify that your platform credentials are configured In the commands that follow, replace the variable placeholders with the following values: -- `$HRN_PARTITION` is the platform environment you are in. Specify `here` unless you are - using the HERE platform environment for 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` is 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/local-pipeline-config.conf) or [HERE China environment](./config/here-china/local-pipeline-config.conf)). +- `$CATALOG_RIB` is the HRN of the public _HERE Map Content_ catalog in your pipeline configuration ([HERE environment](./config/here/local-pipeline-config.conf). - `$CATALOG_ID` is your output catalog's ID. - `$CATALOG_HRN` is your output catalog's `HRN` (returned by the `olp catalog create` command). @@ -112,14 +111,11 @@ job-specific versions of the catalogs, to read and write to. The example project provides two template job configurations, [`config/here/pipeline-job-first.conf`](config/here/pipeline-job-first.conf) and [`config/here/pipeline-job-second.conf`](config/here/pipeline-job-second.conf) for the first and second run of the pipeline, respectively. -If you are using the HERE platform environment in China, use the files [`config/here-china/pipeline-job-first.conf`](config/here-china/pipeline-job-first.conf) -and [`config/here-china/pipeline-job-second.conf`](config/here-china/pipeline-job-second.conf) instead. [`pipeline-job-first.conf`](config/here/pipeline-job-first.conf) specifies in the line `version = 1` that the version 1 of the input catalog should be processed in the first run. You can change this version to any number between 0 and the most recent version of the HERE Map Content catalog. You can find the most recent version by -opening the [HERE platform portal](https://platform.here.com/) or the -[HERE platform portal in China](https://platform.hereolp.cn/) and navigating to the `HERE Map Content` catalog, and viewing the current catalog's version in the `Catalog info` section. +opening the [HERE platform portal](https://platform.here.com/) and navigating to the `HERE Map Content` catalog, and viewing the current catalog's version in the `Catalog info` section. [`pipeline-job-second.conf`](config/here/pipeline-job-second.conf) specifies in the line `version = 2` that version 2 of the input catalog should be processed in the second run. You can change this version to any number that is @@ -127,16 +123,14 @@ less than or equal to the most recent version of the HERE Map Content catalog an specified in [`config/here/pipeline-job-first.conf`](config/here/pipeline-job-first.conf). 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). The first run of the pipeline will use the job configuration [`pipeline-job-first.conf`](config/here/pipeline-job-first.conf). As mentioned before, the first run will compute the differences between the catalog version specified @@ -155,17 +149,6 @@ mvn exec:java \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -mvn exec:java \ --Dexec.mainClass=com.here.platform.data.processing.example.java.difftool.processor.Main \ --Dpipeline-config.file=./config/here-china/local-pipeline-config.conf \ --Dpipeline-job.file=./config/here-china/pipeline-job-first.conf \ --Dconfig.file=./config/here-china/local-application.conf \ --Dspark.master=local[*] -``` - In the second run, we can now compute the differences between the version used in the first run and the version specified in [`pipeline-job-second.conf`](config/here/pipeline-job-second.conf). Run the following command line in the [`heremapcontent-difftool`](../heremapcontent-difftool) project to run the Compiler the second time. @@ -181,17 +164,6 @@ mvn exec:java \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -mvn exec:java \ --Dexec.mainClass=com.here.platform.data.processing.example.java.difftool.processor.Main \ --Dpipeline-config.file=./config/here-china/local-pipeline-config.conf \ --Dpipeline-job.file=./config/here-china/pipeline-job-second.conf \ --Dconfig.file=./config/here-china/local-application.conf \ --Dspark.master=local[*] -``` - After the second run, in the HERE platform environment you can inspect the local catalog with the OLP CLI: ``` @@ -203,9 +175,6 @@ identifiers of segments that were added, removed or modified between the two ver ![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 manually inspect them. - ### Run this Compiler as a HERE Platform Pipeline #### Configure a Project @@ -275,8 +244,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/java/heremapcontent-difftool` project in your Integrated Development Environment (IDE). -The `config/here/pipeline-config.conf` (for the HERE platform environment) and -`config/here-china/pipeline-config.conf` (for the HERE platform environment in China) files contain +The `config/here/pipeline-config.conf` (for the HERE platform environment) file contains 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 @@ -301,14 +269,11 @@ compiler on. The example project provides two template job configurations, `config/here/pipeline-job-first.conf` and `config/here/pipeline-job-second.conf` for the first and second run of the pipeline, respectively. -If you are using the HERE platform environment in China, use the files `config/here-chine/pipeline-job-first.conf` -and `config/here-china/pipeline-job-second.conf` instead. `pipeline-job-first.conf` specifies in the line `version = 1` that the version 1 of the input catalog should be processed in the first run. You can change this version to any number between 0 and the most recent version of the HERE Map Content catalog. You can find the most recent version by -opening the [HERE platform portal](https://platform.here.com/) or the -[HERE platform portal in China](https://platform.hereolp.cn/) and navigating to the HERE Map Content catalog, and viewing the current catalog's version in the Catalog info section. +opening the [HERE platform portal](https://platform.here.com/) and navigating to the HERE Map Content catalog, and viewing the current catalog's version in the Catalog info section. `pipeline-job-second.conf` specifies in the line `version = 2` that version 2 of the input catalog should be processed in the second run. You can change this version to any number that is @@ -331,8 +296,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 pipeline UI](https://platform.here.com/pipelines) (the -[HERE China pipeline UI](https://platform.hereolp.cn/pipelines) in China) +can upload it using the [HERE pipeline 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: @@ -341,8 +305,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. @@ -378,12 +341,12 @@ olp pipeline version activate $PIPELINE_ID $PIPELINE_VERSION_ID \ --scope $PROJECT_HRN ``` -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 `topology-geometry-diff` layer and select the **Inspect** tab. diff --git a/data-processing/java/heremapcontent-difftool/config/here-china/local-application.conf b/data-processing/java/heremapcontent-difftool/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/java/heremapcontent-difftool/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/java/heremapcontent-difftool/config/here-china/local-pipeline-config.conf b/data-processing/java/heremapcontent-difftool/config/here-china/local-pipeline-config.conf deleted file mode 100644 index b9cbcff4e..000000000 --- a/data-processing/java/heremapcontent-difftool/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::difftool-java" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-config.conf b/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-job-first.conf b/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-job-first.conf deleted file mode 100644 index 8e00f3c82..000000000 --- a/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-job-first.conf +++ /dev/null @@ -1,11 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - - rib { - processing-type = "reprocess" - version = 0 - } - - } -} diff --git a/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-job-second.conf b/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-job-second.conf deleted file mode 100644 index 47d3331c3..000000000 --- a/data-processing/java/heremapcontent-difftool/config/here-china/pipeline-job-second.conf +++ /dev/null @@ -1,12 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - - rib { - processing-type = "changes" - version = 2 - since-version = 1 - } - - } -} \ No newline at end of file diff --git a/data-processing/java/heremapcontent-difftool/pom.xml b/data-processing/java/heremapcontent-difftool/pom.xml index f5591e81e..2a75b5a74 100644 --- a/data-processing/java/heremapcontent-difftool/pom.xml +++ b/data-processing/java/heremapcontent-difftool/pom.xml @@ -4,7 +4,7 @@ com.here.platform.data.processing.example.java heremapcontent-difftool - 0.0.861 + 0.0.865 jar HERE Map Content Differences example for Java @@ -23,14 +23,14 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 1.8 ${java.version} ${java.version} - 2.58.2 + 2.59.2 1.6.0 3.2.1 4.5.4 diff --git a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Compiler.java b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Compiler.java index ce771bee0..04b41f126 100644 --- a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Compiler.java +++ b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Compiler.java @@ -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. diff --git a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Defs.java b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Defs.java index 1b24b3628..cb07c178b 100644 --- a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Defs.java +++ b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Defs.java @@ -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. diff --git a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/GeometryDiff.java b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/GeometryDiff.java index 79ceb9658..40aea75d1 100644 --- a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/GeometryDiff.java +++ b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/GeometryDiff.java @@ -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. diff --git a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/IntermediateData.java b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/IntermediateData.java index 86f295224..7987bf631 100644 --- a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/IntermediateData.java +++ b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/IntermediateData.java @@ -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. diff --git a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Main.java b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Main.java index d537f9ba7..eacd31337 100644 --- a/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Main.java +++ b/data-processing/java/heremapcontent-difftool/src/main/java/com/here/platform/data/processing/example/java/difftool/processor/Main.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/README.md b/data-processing/java/pedestrian-topologies-extraction-geojson/README.md index 696616c6c..547c10d76 100644 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/README.md +++ b/data-processing/java/pedestrian-topologies-extraction-geojson/README.md @@ -31,7 +31,7 @@ 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). - `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command). -- `$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. @@ -98,16 +98,14 @@ to specify the location of a configuration file that contains the catalogs as we 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). Finally, execute the following command in the [`pedestrian-topologies-extraction-geojson`](../pedestrian-topologies-extraction-geojson) directory to run the Pedestrian Topologies Compiler. @@ -123,17 +121,6 @@ mvn exec:java \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -mvn exec:java \ --Dexec.mainClass=com.here.platform.data.processing.example.java.pedestrian.geojson.Main \ --Dpipeline-config.file=./config/china-here/local-pipeline-config.conf \ --Dpipeline-job.file=./config/china-here/pipeline-job.conf \ --Dconfig.file=./config/china-here/local-application.conf \ --Dspark.master=local[*] -``` - After one run, in the HERE platform environment, you can inspect the local catalog with the OLP CLI: ``` @@ -144,16 +131,13 @@ 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 To follow this example, you will need a [project](https://developer.here.com/documentation/identity-access-management/dev_guide/topics/manage-projects.html). A project is a collection of platform resources (catalogs, pipelines, and schemas) with controlled access. You can create a project through the -[HERE platform portal](https://platform.here.com/) / [HERE platform portal in China](https://platform.hereolp.cn/). +[HERE platform portal](https://platform.here.com/). Alternatively, use the OLP CLI [`olp project create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html#create-project) command to create the project: @@ -216,8 +200,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/java/pedestrian-topologies-extraction-geojson` 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` file contains 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 @@ -234,19 +217,17 @@ pipeline.config { Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your pedestrian topologies 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 +To find the HRN, in the [HERE platform portal](https://platform.here.com/), navigate to your catalog. The HRN is displayed in the Catalog info section. Alternatively, you can use the catalog's HRN from the OLP CLI output from [Create a Pedestrian Topologies Catalog](#create-a-pedestrian-topologies-catalog). -The `config/here/pipeline-job.conf` and `config/here-china/pipeline-job.conf` files -contain the compiler's run configuration. +The `config/here/pipeline-job.conf` file contains 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 portal](https://platform.here.com/) or the [HERE platform portal in China](https://platform.hereolp.cn/), +[HERE platform portal](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 @@ -265,8 +246,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: @@ -275,8 +255,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. @@ -307,7 +286,7 @@ 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. Once the processing is finished, a new version to your `pedestriansegments` layer will be added. @@ -316,7 +295,7 @@ You can now go to the [Verify the Output](#verify-the-output) section to inspect ## 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 `pedestriansegments` layer and select the **Inspect** tab. diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/local-application.conf b/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/local-pipeline-config.conf b/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 1ad02e42d..000000000 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::pedestrian-topologies-java" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-config.conf b/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-job.conf b/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-job.conf deleted file mode 100644 index fb1f56caf..000000000 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - rib { - processing-type = "reprocess" - version = 0 - } - } -} \ No newline at end of file diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/pom.xml b/data-processing/java/pedestrian-topologies-extraction-geojson/pom.xml index fc943e88d..0872a75aa 100644 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/pom.xml +++ b/data-processing/java/pedestrian-topologies-extraction-geojson/pom.xml @@ -4,7 +4,7 @@ com.here.platform.schema.data.processing.example.java pedestrian-topologies-extraction-geojson - 0.0.861 + 0.0.865 jar Batch Processor compiler for GeoJson in Java @@ -23,14 +23,14 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 1.8 ${java.version} ${java.version} - 2.58.2 + 2.59.2 1.6.0 3.2.1 4.5.4 diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Compiler.java b/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Compiler.java index b2a236329..8fe780d85 100644 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Compiler.java +++ b/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Compiler.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/CompilerConfig.java b/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/CompilerConfig.java index fc7e21960..a0ecb8571 100644 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/CompilerConfig.java +++ b/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/CompilerConfig.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Defs.java b/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Defs.java index f74c7425b..ec421b3fe 100644 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Defs.java +++ b/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Defs.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Main.java b/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Main.java index 47640b2aa..5d4312ac5 100644 --- a/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Main.java +++ b/data-processing/java/pedestrian-topologies-extraction-geojson/src/main/java/com/here/platform/data/processing/example/java/pedestrian/geojson/Main.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/README.md b/data-processing/java/pedestrian-topologies-extraction-protobuf/README.md index d4b0c2b64..b46908e80 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/README.md +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/README.md @@ -30,11 +30,10 @@ 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`. - `$REALM` is 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](./compiler/config/here/pipeline-config.conf) or [HERE environment in China](./compiler/config/here-china/pipeline-config.conf)). +- `$CATALOG_RIB` is the HRN of the public _HERE Map Content_ catalog in your pipeline configuration ([HERE environment](./compiler/config/here/pipeline-config.conf). - `$PROJECT_HRN` is your project's `HRN` (returned by `olp project create` command). ### Run the Compiler Locally @@ -106,16 +105,14 @@ 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`](compiler/config/here/local-application.conf) and [`config/here-china/local-application.conf`](compiler/config/here-china/local-application.conf) to +[`config/here/local-application.conf`](compiler/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`](compiler/config/here), -for the HERE platform environment in China, use the files in the [`./config/here-china`](compiler/config/here-china) directory. +Set the environment variable `$PATH_TO_CONFIG_FOLDER` to [`./config/here`](compiler/config/here). Finally, run the following command line in the [`pedestrian-topologies-extraction-protobuf/compiler`](../pedestrian-topologies-extraction-protobuf/compiler) directory to run the Pedestrian Topologies Compiler. @@ -131,17 +128,6 @@ mvn exec:java \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -mvn exec:java \ --Dexec.mainClass=com.here.platform.data.processing.example.java.pedestrian.protobuf.Main \ --Dpipeline-config.file=./config/china-here/local-pipeline-config.conf \ --Dpipeline-job.file=./config/china-here/pipeline-job.conf \ --Dconfig.file=./config/china-here/local-application.conf \ --Dspark.master=local[*] -``` - After one run, in the HERE platform environment, you can inspect the local catalog with the OLP CLI: ``` @@ -152,9 +138,6 @@ You should see the list of partitions with pedestrian topologies: ![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 @@ -224,8 +207,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/java/pedestrian-topologies-extraction-protobuf` 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` (for the HERE platform environment) file contains 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 @@ -241,16 +223,15 @@ pipeline.config { ``` Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your pedestrian topologies 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 +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 `compiler/config/here/pipeline-job.conf` and `compiler/config/here-china/pipeline-job.conf` files -contain the compiler's run configuration. +The `compiler/config/here/pipeline-job.conf` file +contains 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 portal](https://platform.here.com/) or the [HERE platform portal in China](https://platform.hereolp.cn/), +[HERE platform portal](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 @@ -269,8 +250,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 pipeline UI](https://platform.here.com/pipelines) (the -[HERE pipeline UI](https://platform.hereolp.cn/pipelines) in China) +can upload it using the [HERE pipeline 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: @@ -279,8 +259,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. @@ -311,12 +290,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. - Open the `pedestriansegments` layer and select the **Inspect** tab. diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-application.conf b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-pipeline-config.conf b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 1ad02e42d..000000000 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::pedestrian-topologies-java" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-config.conf b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-job.conf b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-job.conf deleted file mode 100644 index fb1f56caf..000000000 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - rib { - processing-type = "reprocess" - version = 0 - } - } -} \ No newline at end of file diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/pom.xml b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/pom.xml index 8eaa0c1ae..d21a1cf3e 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/pom.xml +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/pom.xml @@ -5,12 +5,12 @@ com.here.platform.data.processing.example.java pedestrian-topologies-extraction-protobuf - 0.0.861 + 0.0.865 com.here.platform.data.processing.example.java.pedestrian.protobuf compiler - 0.0.861 + 0.0.865 jar Batch Processor compiler for Protobuf in Java @@ -29,7 +29,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 @@ -64,7 +64,7 @@ com.here.platform.schema.data.processing.example.java.pedestrian.protobuf model_v2_java - 0.0.861 + 0.0.865 diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Compiler.java b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Compiler.java index b4fa68a2e..c0c6f66b7 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Compiler.java +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Compiler.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/CompilerConfig.java b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/CompilerConfig.java index 09b1e92d7..4c7b8978c 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/CompilerConfig.java +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/CompilerConfig.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Defs.java b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Defs.java index 378073f37..6fe828721 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Defs.java +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Defs.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Main.java b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Main.java index c9995ff46..26ffbdb83 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Main.java +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/compiler/src/main/java/com/here/platform/data/processing/example/java/pedestrian/protobuf/Main.java @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/ds/pom.xml b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/ds/pom.xml index 55e842610..a18a3da35 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/ds/pom.xml +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/ds/pom.xml @@ -5,7 +5,7 @@ com.here.platform.schema.data.processing.example.java.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 model_v2_ds @@ -28,7 +28,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/java/pom.xml b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/java/pom.xml index 612ddd0f0..cd1f120c6 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/java/pom.xml +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/java/pom.xml @@ -5,7 +5,7 @@ com.here.platform.schema.data.processing.example.java.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 model_v2_java @@ -28,7 +28,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/pom.xml b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/pom.xml index 962f05f39..a70af030b 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/pom.xml +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/pom.xml @@ -5,12 +5,12 @@ com.here.platform.data.processing.example.java pedestrian-topologies-extraction-protobuf - 0.0.861 + 0.0.865 com.here.platform.schema.data.processing.example.java.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 pom Pedestrian Topologies Extraction Example Java @@ -40,7 +40,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/proto/pom.xml b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/proto/pom.xml index dc7040b07..4570a8cad 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/proto/pom.xml +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/proto/pom.xml @@ -5,7 +5,7 @@ com.here.platform.schema.data.processing.example.java.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 model_v2_proto @@ -28,7 +28,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/proto/src/main/proto/com/here/platform/schema/data/processing/example/java/pedestrian/protobuf/model/v2/model.proto b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/proto/src/main/proto/com/here/platform/schema/data/processing/example/java/pedestrian/protobuf/model/v2/model.proto index 59780196b..8292951f0 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/proto/src/main/proto/com/here/platform/schema/data/processing/example/java/pedestrian/protobuf/model/v2/model.proto +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/proto/src/main/proto/com/here/platform/schema/data/processing/example/java/pedestrian/protobuf/model/v2/model.proto @@ -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. diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/scala/pom.xml b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/scala/pom.xml index 8103ffd4e..ec3e37c57 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/model/scala/pom.xml +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/model/scala/pom.xml @@ -5,7 +5,7 @@ com.here.platform.schema.data.processing.example.java.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 model_v2_scala_2.12 @@ -28,7 +28,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/java/pedestrian-topologies-extraction-protobuf/pom.xml b/data-processing/java/pedestrian-topologies-extraction-protobuf/pom.xml index 1c2e5472b..07818454b 100644 --- a/data-processing/java/pedestrian-topologies-extraction-protobuf/pom.xml +++ b/data-processing/java/pedestrian-topologies-extraction-protobuf/pom.xml @@ -4,7 +4,7 @@ com.here.platform.data.processing.example.java pedestrian-topologies-extraction-protobuf - 0.0.861 + 0.0.865 pom Pedestrian topologies extraction compiler example to ProtoBuf in Java @@ -28,11 +28,11 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 - 2.58.2 + 2.59.2 2.12 diff --git a/data-processing/java/stateful-nodecardinality-extraction/README.md b/data-processing/java/stateful-nodecardinality-extraction/README.md index fba0ca661..f151b1bb4 100644 --- a/data-processing/java/stateful-nodecardinality-extraction/README.md +++ b/data-processing/java/stateful-nodecardinality-extraction/README.md @@ -48,7 +48,7 @@ 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). - `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command). -- `$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. @@ -115,14 +115,11 @@ job-specific versions of the catalogs, to read and write to. The example project provides two template job configurations, [`config/here/pipeline-job-first.conf`](config/here/pipeline-job-first.conf) and [`config/here/pipeline-job-second.conf`](config/here/pipeline-job-second.conf) for the first and second run of the pipeline, respectively. -If you are using the HERE platform environment in China, use the files [`config/here-china/pipeline-job-first.conf`](config/here-china/pipeline-job-first.conf) -and [`config/here-china/pipeline-job-second.conf`](config/here-china/pipeline-job-second.conf) instead. [`pipeline-job-first.conf`](config/here/pipeline-job-first.conf) specifies in the line `version = 1` that the version 1 of the input catalog should be processed in the first run. You can change this version to any number between 0 and the most recent version of the HERE Map Content catalog. You can find the most recent version by -opening the [HERE platform portal](https://platform.here.com/) or the -[HERE platform portal in China](https://platform.hereolp.cn/) and navigating to the `HERE Map Content` catalog, and viewing the current catalog's version in the `Catalog info` section. +opening the [HERE platform portal](https://platform.here.com/) and navigating to the `HERE Map Content` catalog, and viewing the current catalog's version in the `Catalog info` section. [`pipeline-job-second.conf`](config/here/pipeline-job-second.conf) specifies in the line `version = 2` that version 2 of the input catalog should be processed in the second run. You can change this version to any number that is @@ -130,16 +127,14 @@ less than or equal to the most recent version of the HERE Map Content catalog an specified in [`config/here/pipeline-job-first.conf`](config/here/pipeline-job-first.conf). 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). Finally, execute the following command in the [`stateful-nodecardinality-extraction`](../stateful-nodecardinality-extraction) directory to run The Stateful Processing Compiler. @@ -155,17 +150,6 @@ mvn exec:java \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -mvn exec:java \ --Dexec.mainClass=com.here.platform.data.processing.example.java.feedback.Main \ --Dpipeline-config.file=./config/china-here/local-pipeline-config.conf \ --Dpipeline-job.file=./config/china-here/pipeline-job-first.conf \ --Dconfig.file=./config/china-here/local-application.conf \ --Dspark.master=local[*] -``` - To observe the behavior of the Stateful Processing Compiler, you have to run compiler again using [`pipeline-job-second.conf`](config/here/pipeline-job-second.conf) as the job configuration: @@ -180,17 +164,6 @@ mvn exec:java \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -mvn exec:java \ --Dexec.mainClass=com.here.platform.data.processing.example.java.feedback.Main \ --Dpipeline-config.file=./config/china-here/local-pipeline-config.conf \ --Dpipeline-job.file=./config/china-here/pipeline-job-second.conf \ --Dconfig.file=./config/china-here/local-application.conf \ --Dspark.master=local[*] -``` - After the second run, in the HERE platform environment, you can inspect the local catalog with the OLP CLI: ``` @@ -202,16 +175,13 @@ The field `updatesCount` will be `1` for those partitions that did not change du ![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 To follow this example, you will need a [project](https://developer.here.com/documentation/identity-access-management/dev_guide/topics/manage-projects.html). A project is a collection of platform resources (catalogs, pipelines, and schemas) with controlled access. You can create a project through the -[HERE platform portal](https://platform.here.com/) / [HERE platform portal in China](https://platform.hereolp.cn/). +[HERE platform portal](https://platform.here.com/). Alternatively, use the OLP CLI [`olp project create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html#create-project) command to create the project: @@ -274,8 +244,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/java/stateful-nodecardinality-extraction` project in your Integrated Development Environment (IDE). -The `config/here/pipeline-config.conf` (for the HERE platform environment) and -`config/here-china/pipeline-config.conf` (for the HERE platform environment in China) files contain +The `config/here/pipeline-config.conf` (for the HERE platform environment) file contains the permanent configuration of the data sources for the compiler. Pick the file that corresponds to your platform environemnt. For example, the pipeline configuration for @@ -291,15 +260,13 @@ pipeline.config { ``` Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your nodecardinality 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 +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-first.conf` and `config/here/pipeline-second.conf` files contain the compiler's run configuration and point to two different versions of the HERE Map Content Catalog. -To find the latest version of the HERE Map Content catalog, in the [HERE platform portal](https://platform.here.com/) -or the [HERE platform portal in China](https://platform.hereolp.cn/), navigate to the HERE Map Content catalog, and view the current catalog's version in the Catalog info section. +To find the latest version of the HERE Map Content catalog, in the [HERE platform portal](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 `src/main/resources` directory of the compiler project. However, you do not have to modify it unless @@ -317,8 +284,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 pipeline UI](https://platform.here.com/pipelines) (the -[HERE pipeline UI](https://platform.hereolp.cn/pipelines) in China) +can upload it using the [HERE pipeline 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: @@ -327,8 +293,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. @@ -359,12 +324,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 `nodecardinality-count` layer and select the **Inspect** tab. Verify that partitions diff --git a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/local-application.conf b/data-processing/java/stateful-nodecardinality-extraction/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/local-pipeline-config.conf b/data-processing/java/stateful-nodecardinality-extraction/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 0c5c96bf1..000000000 --- a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::stateful-compiler-java" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-config.conf b/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-job-first.conf b/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-job-first.conf deleted file mode 100644 index 664e8afed..000000000 --- a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-job-first.conf +++ /dev/null @@ -1,18 +0,0 @@ -// This configuration file is meant to facilitate the local development -// Please refer to the HERE Data SDK documentation for more information -// -// This file is not supposed to be included in the pipeline JAR. -// For local development, it may be passed to the pipeline using -// -// -Dpipeline-job.file=config/here-china/pipeline-job-first.conf - -pipeline.job.catalog-versions { - - input-catalogs { - - rib { - processing-type = "reprocess" - version = 0 - } - } -} diff --git a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-job-second.conf b/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-job-second.conf deleted file mode 100644 index d555dfe32..000000000 --- a/data-processing/java/stateful-nodecardinality-extraction/config/here-china/pipeline-job-second.conf +++ /dev/null @@ -1,18 +0,0 @@ -// This configuration file is meant to facilitate the local development -// Please refer to the HERE Data SDK documentation for more information -// -// This file is not supposed to be included in the pipeline JAR. -// For local development, it may be passed to the pipeline using -// -// -Dpipeline-job.file=config/here-china/pipeline-job-second.conf - -pipeline.job.catalog-versions { - - input-catalogs { - - rib { - processing-type = "reprocess" - version = 1 - } - } -} diff --git a/data-processing/java/stateful-nodecardinality-extraction/config/here/pipeline-job-second.conf b/data-processing/java/stateful-nodecardinality-extraction/config/here/pipeline-job-second.conf index e85cd3e9a..380b6e657 100644 --- a/data-processing/java/stateful-nodecardinality-extraction/config/here/pipeline-job-second.conf +++ b/data-processing/java/stateful-nodecardinality-extraction/config/here/pipeline-job-second.conf @@ -4,7 +4,7 @@ // This file is not supposed to be included in the pipeline JAR. // For local development, it may be passed to the pipeline using // -// -Dpipeline-job.file=config/here-china/pipeline-job-second.conf +// -Dpipeline-job.file=config/here/pipeline-job-second.conf pipeline.job.catalog-versions { diff --git a/data-processing/java/stateful-nodecardinality-extraction/pom.xml b/data-processing/java/stateful-nodecardinality-extraction/pom.xml index 50915548f..6190bdb32 100644 --- a/data-processing/java/stateful-nodecardinality-extraction/pom.xml +++ b/data-processing/java/stateful-nodecardinality-extraction/pom.xml @@ -4,7 +4,7 @@ com.here.platform.data.processing.example.java stateful-nodecardinality-extraction - 0.0.861 + 0.0.865 jar @@ -25,14 +25,14 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 1.8 ${java.version} ${java.version} - 2.58.2 + 2.59.2 1.6.0 3.2.1 4.5.4 diff --git a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Compiler.java b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Compiler.java index b0750cf1f..c8c3e273a 100644 --- a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Compiler.java +++ b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Compiler.java @@ -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. diff --git a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Defs.java b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Defs.java index 24a8ae589..44b82edfd 100644 --- a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Defs.java +++ b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Defs.java @@ -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. diff --git a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/IntermediateData.java b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/IntermediateData.java index a4d707f9e..a833fbc49 100644 --- a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/IntermediateData.java +++ b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/IntermediateData.java @@ -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. diff --git a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Main.java b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Main.java index 9b2939e2a..22bcf8f36 100644 --- a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Main.java +++ b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/Main.java @@ -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. diff --git a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/NodeCardinalityRunCounter.java b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/NodeCardinalityRunCounter.java index 406dc6b18..1d1b910f9 100644 --- a/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/NodeCardinalityRunCounter.java +++ b/data-processing/java/stateful-nodecardinality-extraction/src/main/java/com/here/platform/data/processing/example/java/feedback/NodeCardinalityRunCounter.java @@ -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. diff --git a/data-processing/scala/geometry-lifter/README.md b/data-processing/scala/geometry-lifter/README.md index ea33579af..e1318be6f 100644 --- a/data-processing/scala/geometry-lifter/README.md +++ b/data-processing/scala/geometry-lifter/README.md @@ -30,12 +30,10 @@ 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`. -- `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command). +- `$HRN_PARTITION` is the platform environment you are in. The value should be `here`. - `$REALM` is 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. @@ -94,16 +92,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. +for the HERE platform environment. Use all the above settings to run the following command in the [`geometry-lifter`](../geometry-lifter) directory to run the Geometry Lifter Compiler. @@ -118,16 +115,6 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -sbt run \ --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: ``` @@ -138,9 +125,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 @@ -211,8 +195,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/scala/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` file contains 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 @@ -228,17 +211,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 +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 -contain the compiler's run configuration. +The `config/here/pipeline-job.conf` file contains 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 @@ -257,8 +238,7 @@ sbt assembly #### 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: @@ -267,8 +247,8 @@ 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. @@ -299,12 +279,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. diff --git a/data-processing/scala/geometry-lifter/build.sbt b/data-processing/scala/geometry-lifter/build.sbt index f50b6d230..abcd6c35e 100644 --- a/data-processing/scala/geometry-lifter/build.sbt +++ b/data-processing/scala/geometry-lifter/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.data.processing.example.scala.geometry.lifter" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn @@ -25,7 +25,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/data-processing/scala/geometry-lifter/config/here-china/local-application.conf b/data-processing/scala/geometry-lifter/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/scala/geometry-lifter/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/scala/geometry-lifter/config/here-china/local-pipeline-config.conf b/data-processing/scala/geometry-lifter/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 5f1f55dd4..000000000 --- a/data-processing/scala/geometry-lifter/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,8 +0,0 @@ -pipeline.config { - - output-catalog {hrn = "hrn:local:data:::geometry-lifter-scala"} - - input-catalogs { - rib {hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2"} - } -} diff --git a/data-processing/scala/geometry-lifter/config/here-china/pipeline-config.conf b/data-processing/scala/geometry-lifter/config/here-china/pipeline-config.conf deleted file mode 100644 index c09ed36c9..000000000 --- a/data-processing/scala/geometry-lifter/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,8 +0,0 @@ -pipeline.config { - - output-catalog {hrn = "YOUR_OUTPUT_CATALOG_HRN"} - - input-catalogs { - rib {hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2"} - } -} diff --git a/data-processing/scala/geometry-lifter/config/here-china/pipeline-job.conf b/data-processing/scala/geometry-lifter/config/here-china/pipeline-job.conf deleted file mode 100644 index 71f720be2..000000000 --- a/data-processing/scala/geometry-lifter/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - rib { - processing-type = "reprocess" - version = 0 - } - } -} diff --git a/data-processing/scala/geometry-lifter/project/Dependencies.scala b/data-processing/scala/geometry-lifter/project/Dependencies.scala index 57f2d191f..3a740da50 100644 --- a/data-processing/scala/geometry-lifter/project/Dependencies.scala +++ b/data-processing/scala/geometry-lifter/project/Dependencies.scala @@ -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. diff --git a/data-processing/scala/geometry-lifter/project/plugins.sbt b/data-processing/scala/geometry-lifter/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/data-processing/scala/geometry-lifter/project/plugins.sbt +++ b/data-processing/scala/geometry-lifter/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Compiler.scala b/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Compiler.scala index a82028c51..2b21fe817 100644 --- a/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Compiler.scala +++ b/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Compiler.scala @@ -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. diff --git a/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/CompilerConfig.scala b/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/CompilerConfig.scala index e53aa4504..c603b648e 100644 --- a/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/CompilerConfig.scala +++ b/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/CompilerConfig.scala @@ -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. diff --git a/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Defs.scala b/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Defs.scala index f29e3836d..489afeabe 100644 --- a/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Defs.scala +++ b/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Defs.scala @@ -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. diff --git a/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Main.scala b/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Main.scala index 1c206f874..21c2c7622 100644 --- a/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Main.scala +++ b/data-processing/scala/geometry-lifter/src/main/scala/com/here/platform/data/processing/example/scala/geometry/lifter/Main.scala @@ -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. diff --git a/data-processing/scala/heremapcontent-difftool/README.md b/data-processing/scala/heremapcontent-difftool/README.md index 6ea5115f4..ed843aaab 100644 --- a/data-processing/scala/heremapcontent-difftool/README.md +++ b/data-processing/scala/heremapcontent-difftool/README.md @@ -37,12 +37,11 @@ For more details on how to verify that your platform credentials are configured In the commands that follow, replace the variable placeholders with the following values: -- `$HRN_PARTITION` is the platform environment you are in. Specify `here` unless you are - using the HERE platform China environment, 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` is 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/local-pipeline-config.conf) or [HERE China environment](./config/here-china/local-pipeline-config.conf)). +- `$CATALOG_RIB` is the HRN of the public _HERE Map Content_ catalog in your pipeline configuration ([HERE environment](./config/here/local-pipeline-config.conf). - `$CATALOG_ID` is your output catalog's ID. - `$CATALOG_HRN` is your output catalog's `HRN` (returned by the `olp catalog create` command). @@ -111,14 +110,11 @@ job-specific versions of the catalogs, to read and write to. The example project provides two template job configurations, [`config/here/pipeline-job-first.conf`](config/here/pipeline-job-first.conf) and [`config/here/pipeline-job-second.conf`](config/here/pipeline-job-second.conf) for the first and second run of the pipeline, respectively. -If you are using the HERE platform environment in China, use the files [`config/here-china/pipeline-job-first.conf`](config/here-china/pipeline-job-first.conf) -and [`config/here-china/pipeline-job-second.conf`](config/here-china/pipeline-job-second.conf) instead. [`pipeline-job-first.conf`](config/here/pipeline-job-first.conf) specifies in the line `version = 1` that the version 1 of the input catalog should be processed in the first run. You can change this version to any number between 0 and the most recent version of the HERE Map Content catalog. You can find the most recent version by -opening the [HERE platform portal](https://platform.here.com/) or the -[HERE platform portal in China](https://platform.hereolp.cn/) and navigating to the `HERE Map Content` catalog, and viewing the current catalog's version in the `Catalog info` section. +opening the [HERE platform portal](https://platform.here.com/) and navigating to the `HERE Map Content` catalog, and viewing the current catalog's version in the `Catalog info` section. [`pipeline-job-second.conf`](config/here/pipeline-job-second.conf) specifies in the line `version = 2` that version 2 of the input catalog should be processed in the second run. You can change this version to any number that is @@ -126,16 +122,14 @@ less than or equal to the most recent version of the HERE Map Content catalog an specified in [`config/here/pipeline-job-first.conf`](config/here/pipeline-job-first.conf). 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). The first run of the pipeline will use the job configuration [`pipeline-job-first.conf`](config/here/pipeline-job-first.conf). As mentioned before, the first run will compute the differences between the catalog version specified @@ -153,16 +147,6 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -sbt run \ --Dpipeline-config.file=./config/here-china/local-pipeline-config.conf \ --Dpipeline-job.file=./config/here-china/pipeline-job-first.conf \ --Dconfig.file=./config/here-china/local-application.conf \ --Dspark.master=local[*] -``` - In the second run, we can now compute the differences between the version used in the first run and the version specified in [`pipeline-job-second.conf`](config/here/pipeline-job-second.conf). Run the following command line in the [`heremapcontent-difftool`](../heremapcontent-difftool) project to run the Compiler the second time. @@ -177,16 +161,6 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -sbt run \ --Dpipeline-config.file=./config/here-china/local-pipeline-config.conf \ --Dpipeline-job.file=./config/here-china/pipeline-job-second.conf \ --Dconfig.file=./config/here-china/local-application.conf \ --Dspark.master=local[*] -``` - After the second run, in the HERE platform environment, you can inspect the local catalog with the OLP CLI: ``` @@ -198,9 +172,6 @@ identifiers of segments that were added, removed or modified between the two ver ![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 @@ -270,8 +241,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/scala/heremapcontent-difftool` project in your Integrated Development Environment (IDE). -The `config/here/pipeline-config.conf` (for the HERE platform environment) and -`config/here-china/pipeline-config.conf` (for the HERE platform environment in China) files contain +The `config/here/pipeline-config.conf` (for the HERE platform environment) file contains 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 @@ -296,14 +266,11 @@ compiler on. The example project provides two template job configurations, `config/here/pipeline-job-first.conf` and `config/here/pipeline-job-second.conf` for the first and second run of the pipeline, respectively. -If you are using the HERE platform environment in China, use the files `config/here-chine/pipeline-job-first.conf` -and `config/here-china/pipeline-job-second.conf` instead. `pipeline-job-first.conf` specifies in the line `version = 1` that the version 1 of the input catalog should be processed in the first run. You can change this version to any number between 0 and the most recent version of the HERE Map Content catalog. You can find the most recent version by -opening the [HERE platform portal](https://platform.here.com/) or the -[HERE platform portal in China](https://platform.hereolp.cn/) and navigating to the HERE Map Content catalog, and viewing the current catalog's version in the Catalog info section. +opening the [HERE platform portal](https://platform.here.com/) and navigating to the HERE Map Content catalog, and viewing the current catalog's version in the Catalog info section. `pipeline-job-second.conf` specifies in the line `version = 2` that version 2 of the input catalog should be processed in the second run. You can change this version to any number that is @@ -326,8 +293,7 @@ sbt assembly #### 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 pipeline UI](https://platform.here.com/pipelines) (the -[HERE pipeline UI for China](https://platform.hereolp.cn/pipelines) in China) +can upload it using the [HERE pipeline 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: @@ -336,8 +302,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. @@ -373,12 +338,12 @@ olp pipeline version activate $PIPELINE_ID $PIPELINE_VERSION_ID \ --scope $PROJECT_HRN ``` -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 `topology-geometry-diff` layer and select the **Inspect** tab. diff --git a/data-processing/scala/heremapcontent-difftool/build.sbt b/data-processing/scala/heremapcontent-difftool/build.sbt index e39b0ba59..8c361e343 100644 --- a/data-processing/scala/heremapcontent-difftool/build.sbt +++ b/data-processing/scala/heremapcontent-difftool/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.data.processing.example.scala" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn val organizationSettings: Seq[Setting[_]] = Seq( @@ -24,7 +24,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/data-processing/scala/heremapcontent-difftool/config/here-china/local-application.conf b/data-processing/scala/heremapcontent-difftool/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/scala/heremapcontent-difftool/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/scala/heremapcontent-difftool/config/here-china/local-pipeline-config.conf b/data-processing/scala/heremapcontent-difftool/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 6bd489e26..000000000 --- a/data-processing/scala/heremapcontent-difftool/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::difftool-scala" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-config.conf b/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-job-first.conf b/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-job-first.conf deleted file mode 100644 index 7e0cdec30..000000000 --- a/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-job-first.conf +++ /dev/null @@ -1,11 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - - rib { - processing-type = "reprocess" - version = 0 - } - - } -} \ No newline at end of file diff --git a/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-job-second.conf b/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-job-second.conf deleted file mode 100644 index 97ba682e4..000000000 --- a/data-processing/scala/heremapcontent-difftool/config/here-china/pipeline-job-second.conf +++ /dev/null @@ -1,11 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - - rib { - processing-type = "reprocess" - version = 1 - } - - } -} \ No newline at end of file diff --git a/data-processing/scala/heremapcontent-difftool/project/Dependencies.scala b/data-processing/scala/heremapcontent-difftool/project/Dependencies.scala index 57f2d191f..3a740da50 100644 --- a/data-processing/scala/heremapcontent-difftool/project/Dependencies.scala +++ b/data-processing/scala/heremapcontent-difftool/project/Dependencies.scala @@ -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. diff --git a/data-processing/scala/heremapcontent-difftool/project/plugins.sbt b/data-processing/scala/heremapcontent-difftool/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/data-processing/scala/heremapcontent-difftool/project/plugins.sbt +++ b/data-processing/scala/heremapcontent-difftool/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/Compiler.scala b/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/Compiler.scala index 1c3b88b1a..42ca8d023 100644 --- a/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/Compiler.scala +++ b/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/Compiler.scala @@ -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. diff --git a/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/IntermediateData.scala b/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/IntermediateData.scala index 0f4cbf43d..8034abb29 100644 --- a/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/IntermediateData.scala +++ b/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/IntermediateData.scala @@ -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. diff --git a/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/LayersDefinitions.scala b/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/LayersDefinitions.scala index a3217353f..64fc16e97 100644 --- a/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/LayersDefinitions.scala +++ b/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/LayersDefinitions.scala @@ -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. diff --git a/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/Main.scala b/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/Main.scala index 586a033f4..c4c98d8da 100644 --- a/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/Main.scala +++ b/data-processing/scala/heremapcontent-difftool/src/main/scala/com/here/platform/data/processing/example/scala/difftool/processor/Main.scala @@ -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. diff --git a/data-processing/scala/heremapcontent-validation/README.md b/data-processing/scala/heremapcontent-validation/README.md index 4f003f5aa..0ebe842b4 100644 --- a/data-processing/scala/heremapcontent-validation/README.md +++ b/data-processing/scala/heremapcontent-validation/README.md @@ -57,12 +57,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 `olp catalog create`). -- `$HRN_PARTITION` is the platform environment you are in. Specify `here` unless you are - using the HERE platform China environment, 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 `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 China environment](./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 you to set values to variables so that you can easily copy and execute the following commands. @@ -133,10 +132,9 @@ _parameters_ to specify the location of a configuration file that contains the c job-specific versions of the catalogs, to read and write to. For local runs, a bounding box filter is provided in the -`config/here/local-application.conf` and `config/here-china/local-application.conf` to +`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 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. @@ -154,24 +152,13 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform China environment: - -``` -sbt run \ --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: ``` olp local catalog inspect hrn:local:data:::heremapcontent-validation ``` -The `local inspect` command is not available in the HERE platform China environment, but you can -download partitions from the local catalog to manually inspect them. The command below, for example, +You can also download partitions from the local catalog to manually inspect them. The command below, for example, downloads the aggregated metrics containing all statistics about the validation run. Metrics are aggregated at different zoom levels, and the root partition (HERE Tile ID 1) contains the aggregation of all metrics partitions: @@ -275,8 +262,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/scala/heremapcontent-validation` project in your Integrated Development Environment (IDE). -The `config/here/pipeline-config.conf` (for the HERE platform environment) and -`config/here-china/pipeline-config.conf` (for the HERE platform China environment) files contain +The `config/here/pipeline-config.conf` (for the HERE platform environment) file contains 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 @@ -292,8 +278,7 @@ pipeline.config { ``` Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your validation catalog. -To find the HRN, in the [HERE platform portal](https://platform.here.com/) or the -[HERE platform China portal](https://platform.hereolp.cn/), navigate to your catalog. The HRN is displayed in the upper +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 page. The remainder of the configuration is specified in the `application.conf` file that can be found in the @@ -312,8 +297,7 @@ sbt assembly #### 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 China 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: @@ -322,8 +306,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. @@ -354,12 +337,12 @@ olp pipeline version activate $PIPELINE_ID $PIPELINE_VERSION_ID \ You don't 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 China portal](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 China portal](https://platform.hereolp.cn/) +In the [HERE platform portal](https://platform.here.com/) select the _Data_ tab and find your catalog. 1. Open the `assessment` layer and select the _Inspect_ tab. diff --git a/data-processing/scala/heremapcontent-validation/build.sbt b/data-processing/scala/heremapcontent-validation/build.sbt index 4536864f9..abc71852b 100644 --- a/data-processing/scala/heremapcontent-validation/build.sbt +++ b/data-processing/scala/heremapcontent-validation/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.data.processing.example.scala" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn @@ -25,7 +25,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/data-processing/scala/heremapcontent-validation/config/here-china/local-application.conf b/data-processing/scala/heremapcontent-validation/config/here-china/local-application.conf deleted file mode 100644 index 618f3098b..000000000 --- a/data-processing/scala/heremapcontent-validation/config/here-china/local-application.conf +++ /dev/null @@ -1,23 +0,0 @@ -include "application" - -here.platform.data-processing.deltasets { - // during local development we turn off incremental compilation to not worry about increasing - // applicationVersion at each code change - default.incremental = false - - // during local development we compile a subset of HERE Map Content - partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } - ] -} diff --git a/data-processing/scala/heremapcontent-validation/config/here-china/local-pipeline-config.conf b/data-processing/scala/heremapcontent-validation/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 051aca3a3..000000000 --- a/data-processing/scala/heremapcontent-validation/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,8 +0,0 @@ -pipeline.config { - - output-catalog {hrn = "hrn:local:data:::heremapcontent-validation"} - - input-catalogs { - hmc {hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2"} - } -} diff --git a/data-processing/scala/heremapcontent-validation/config/here-china/pipeline-config.conf b/data-processing/scala/heremapcontent-validation/config/here-china/pipeline-config.conf deleted file mode 100644 index 0e14f37fd..000000000 --- a/data-processing/scala/heremapcontent-validation/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - // TODO: Change to match the HRN of the created catalog - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - hmc {hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2"} - } -} diff --git a/data-processing/scala/heremapcontent-validation/config/here-china/pipeline-job.conf b/data-processing/scala/heremapcontent-validation/config/here-china/pipeline-job.conf deleted file mode 100644 index 697c1ec45..000000000 --- a/data-processing/scala/heremapcontent-validation/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - hmc { - processing-type = "reprocess" - version = 0 - } - } -} diff --git a/data-processing/scala/heremapcontent-validation/project/Dependencies.scala b/data-processing/scala/heremapcontent-validation/project/Dependencies.scala index aa652f316..1fe141432 100644 --- a/data-processing/scala/heremapcontent-validation/project/Dependencies.scala +++ b/data-processing/scala/heremapcontent-validation/project/Dependencies.scala @@ -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. diff --git a/data-processing/scala/heremapcontent-validation/project/plugins.sbt b/data-processing/scala/heremapcontent-validation/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/data-processing/scala/heremapcontent-validation/project/plugins.sbt +++ b/data-processing/scala/heremapcontent-validation/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/data-processing/scala/heremapcontent-validation/src/main/scala/com/here/platform/data/processing/example/scala/validation/Main.scala b/data-processing/scala/heremapcontent-validation/src/main/scala/com/here/platform/data/processing/example/scala/validation/Main.scala index fb75e85c1..65d50b469 100644 --- a/data-processing/scala/heremapcontent-validation/src/main/scala/com/here/platform/data/processing/example/scala/validation/Main.scala +++ b/data-processing/scala/heremapcontent-validation/src/main/scala/com/here/platform/data/processing/example/scala/validation/Main.scala @@ -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. diff --git a/data-processing/scala/heremapcontent-validation/src/main/scala/com/here/platform/data/processing/example/scala/validation/TopologyGeometrySuite.scala b/data-processing/scala/heremapcontent-validation/src/main/scala/com/here/platform/data/processing/example/scala/validation/TopologyGeometrySuite.scala index c4944df3d..ee8528a9e 100644 --- a/data-processing/scala/heremapcontent-validation/src/main/scala/com/here/platform/data/processing/example/scala/validation/TopologyGeometrySuite.scala +++ b/data-processing/scala/heremapcontent-validation/src/main/scala/com/here/platform/data/processing/example/scala/validation/TopologyGeometrySuite.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/README.md b/data-processing/scala/pedestrian-topologies-extraction-deltasets/README.md index 92ffe226f..6ebca5291 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/README.md +++ b/data-processing/scala/pedestrian-topologies-extraction-deltasets/README.md @@ -29,7 +29,7 @@ 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). - `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command). -- `$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. @@ -96,16 +96,14 @@ 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). Finally, execute the following command in the `pedestrian-topologies-extraction-deltasets` directory to run the Pedestrian Topologies Compiler. @@ -120,16 +118,6 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -sbt run \ --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: ``` @@ -140,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 @@ -211,9 +196,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/scala/pedestrian-topologies-extraction-deltasets` 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` file contains 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 @@ -229,16 +212,15 @@ pipeline.config { ``` Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your pedestrian topologies 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 +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 -contain the compiler's run configuration. +The `config/here/pipeline-job.conf` file +contains 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 portal](https://platform.here.com/) or the [HERE platform portal in China](https://platform.hereolp.cn/), +[HERE platform portal](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 @@ -257,8 +239,7 @@ sbt assembly #### 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: @@ -267,8 +248,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. @@ -299,12 +279,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 `pedestriansegments` layer and select the **Inspect** tab. diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/build.sbt b/data-processing/scala/pedestrian-topologies-extraction-deltasets/build.sbt index 19cef3919..55713083c 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/build.sbt +++ b/data-processing/scala/pedestrian-topologies-extraction-deltasets/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.data.processing.example.scala" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn @@ -26,7 +26,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/local-application.conf b/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/local-application.conf deleted file mode 100644 index 618f3098b..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/local-application.conf +++ /dev/null @@ -1,23 +0,0 @@ -include "application" - -here.platform.data-processing.deltasets { - // during local development we turn off incremental compilation to not worry about increasing - // applicationVersion at each code change - default.incremental = false - - // during local development we compile a subset of HERE Map Content - partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } - ] -} diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/local-pipeline-config.conf b/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 621fba5c2..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,8 +0,0 @@ -pipeline.config { - - output-catalog {hrn = "hrn:local:data:::pedestrian-topologies"} - - input-catalogs { - rib {hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2"} - } -} \ No newline at end of file diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/pipeline-config.conf b/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/pipeline-job.conf b/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/pipeline-job.conf deleted file mode 100644 index fb1f56caf..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - rib { - processing-type = "reprocess" - version = 0 - } - } -} \ No newline at end of file diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/project/Dependencies.scala b/data-processing/scala/pedestrian-topologies-extraction-deltasets/project/Dependencies.scala index 01a7fd168..60e98acb5 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/project/Dependencies.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-deltasets/project/Dependencies.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/project/plugins.sbt b/data-processing/scala/pedestrian-topologies-extraction-deltasets/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/project/plugins.sbt +++ b/data-processing/scala/pedestrian-topologies-extraction-deltasets/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Compiler.scala b/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Compiler.scala index b78c14fcb..d12cc6489 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Compiler.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Compiler.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/CompilerConfig.scala b/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/CompilerConfig.scala index 2beafa9c5..8d4f58efe 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/CompilerConfig.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/CompilerConfig.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Defs.scala b/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Defs.scala index dc0c0e142..2be4bffb4 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Defs.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Defs.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Main.scala b/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Main.scala index 52d54b567..42497ed9a 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Main.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-deltasets/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/deltasets/Main.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/README.md b/data-processing/scala/pedestrian-topologies-extraction-geojson/README.md index 514f51386..ffc713318 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/README.md +++ b/data-processing/scala/pedestrian-topologies-extraction-geojson/README.md @@ -31,7 +31,7 @@ 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). - `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command). -- `$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. @@ -99,16 +99,14 @@ 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). Finally, execute the following command in the [`pedestrian-topologies-extraction-geojson`](../pedestrian-topologies-extraction-geojson) directory to run the Pedestrian Topologies Compiler. @@ -123,16 +121,6 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -sbt run \ --Dpipeline-config.file=./config/china-here/local-pipeline-config.conf \ --Dpipeline-job.file=./config/china-here/pipeline-job.conf \ --Dconfig.file=./config/china-here/local-application.conf \ --Dspark.master=local[*] -``` - After one run, in the HERE platform environment, you can inspect the local catalog with the OLP CLI: ``` @@ -143,16 +131,13 @@ 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 To follow this example, you will need a [project](https://developer.here.com/documentation/identity-access-management/dev_guide/topics/manage-projects.html). A project is a collection of platform resources (catalogs, pipelines, and schemas) with controlled access. You can create a project through the -[HERE platform portal](https://platform.here.com/) / [HERE platform portal in China](https://platform.hereolp.cn/). +[HERE platform portal](https://platform.here.com/). Alternatively, use the OLP CLI [`olp project create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html#create-project) command to create the project: @@ -215,8 +200,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/scala/pedestrian-topologies-extraction-geojson` 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` file contains 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 @@ -233,19 +217,18 @@ pipeline.config { Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your pedestrian topologies 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 +To find the HRN, in the [HERE platform portal](https://platform.here.com/), navigate to your catalog. The HRN is displayed in the Catalog info section. Alternatively, you can use the catalog's HRN from the OLP CLI output from [Create a Pedestrian Topologies Catalog](#create-a-pedestrian-topologies-catalog). -The `config/here/pipeline-job.conf` and `config/here-china/pipeline-job.conf` files -contain the compiler's run configuration. +The `config/here/pipeline-job.conf` file +contains 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 portal](https://platform.here.com/) or the [HERE platform portal in China](https://platform.hereolp.cn/), +[HERE platform portal](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 @@ -264,8 +247,7 @@ sbt assembly #### 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: @@ -274,8 +256,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. @@ -306,7 +287,7 @@ 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. Once the processing is finished, a new version to your `pedestriansegments` layer will be added. @@ -315,7 +296,7 @@ You can now go to the [Verify the Output](#verify-the-output) section to inspect ## 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 `pedestriansegments` layer and select the **Inspect** tab. diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/build.sbt b/data-processing/scala/pedestrian-topologies-extraction-geojson/build.sbt index 71e62d5ea..b5cce699e 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/build.sbt +++ b/data-processing/scala/pedestrian-topologies-extraction-geojson/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.data.processing.example.scala" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn @@ -25,7 +25,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/local-application.conf b/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/local-pipeline-config.conf b/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/local-pipeline-config.conf deleted file mode 100644 index d0bf6cccb..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::pedestrian-topologies-scala" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-config.conf b/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-job.conf b/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-job.conf deleted file mode 100644 index fb1f56caf..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - rib { - processing-type = "reprocess" - version = 0 - } - } -} \ No newline at end of file diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/project/Dependencies.scala b/data-processing/scala/pedestrian-topologies-extraction-geojson/project/Dependencies.scala index 01a7fd168..60e98acb5 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/project/Dependencies.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-geojson/project/Dependencies.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/project/plugins.sbt b/data-processing/scala/pedestrian-topologies-extraction-geojson/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/project/plugins.sbt +++ b/data-processing/scala/pedestrian-topologies-extraction-geojson/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Compiler.scala b/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Compiler.scala index 77568889a..758d11358 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Compiler.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Compiler.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/CompilerConfig.scala b/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/CompilerConfig.scala index f693dd3b4..0274b0394 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/CompilerConfig.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/CompilerConfig.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Defs.scala b/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Defs.scala index 255a11844..da6c5a249 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Defs.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Defs.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Main.scala b/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Main.scala index 5e5b13280..6202d862e 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Main.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-geojson/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/geojson/Main.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/README.md b/data-processing/scala/pedestrian-topologies-extraction-protobuf/README.md index e1822f4b3..069ed46a5 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/README.md +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/README.md @@ -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` is 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](./compiler/config/here/pipeline-config.conf) or [HERE environment in China](./compiler/config/here-china/pipeline-config.conf)). +- `$CATALOG_RIB` is the HRN of the public _HERE Map Content_ catalog in your pipeline configuration ([HERE environment](./compiler/config/here/pipeline-config.conf). ### Run the Compiler Locally @@ -123,16 +122,14 @@ 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`](compiler/config/here/local-application.conf) and [`config/here-china/local-application.conf`](compiler/config/here-china/local-application.conf) to +[`config/here/local-application.conf`](compiler/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`](compiler/config/here), -for the HERE platform environment in China, use the files in the [`./config/here-china`](compiler/config/here-china) directory. +Set the environment variable `$PATH_TO_CONFIG_FOLDER` to [`./config/here`](compiler/config/here). Finally, run the following command line in the [`pedestrian-topologies-extraction-protobuf/compiler`](../pedestrian-topologies-extraction-protobuf/compiler) directory to run the Pedestrian Topologies Compiler. @@ -147,16 +144,6 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -sbt run \ --Dpipeline-config.file=./config/china-here/local-pipeline-config.conf \ --Dpipeline-job.file=./config/china-here/pipeline-job.conf \ --Dconfig.file=./config/china-here/local-application.conf \ --Dspark.master=local[*] -``` - After one run, in the HERE platform environment, you can inspect the local catalog with the OLP CLI: ``` @@ -167,9 +154,6 @@ You should see the list of partitions with pedestrian topologies: ![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 @@ -239,8 +223,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/scala/pedestrian-topologies-extraction-protobuf` 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` (for the HERE platform environment) file contains 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 @@ -256,16 +239,15 @@ pipeline.config { ``` Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your pedestrian topologies 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 +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 `compiler/config/here/pipeline-job.conf` and `compiler/config/here-china/pipeline-job.conf` files -contain the compiler's run configuration. +The `compiler/config/here/pipeline-job.conf` file +contains 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 portal](https://platform.here.com/) or the [HERE platform portal in China](https://platform.hereolp.cn/), +[HERE platform portal](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 @@ -284,8 +266,7 @@ sbt assembly #### 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 pipeline UI](https://platform.here.com/pipelines) (the -[HERE pipeline UI](https://platform.hereolp.cn/pipelines) in China) +can upload it using the [HERE pipeline 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: @@ -294,8 +275,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. @@ -326,12 +306,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. - Open the `pedestriansegments` layer and select the **Inspect** tab. diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/build.sbt b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/build.sbt index 01afef100..d05aace15 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/build.sbt +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.data.processing.example.scala.pedestrian.protobuf" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn val organizationSettings: Seq[Setting[_]] = Seq( @@ -24,7 +24,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-application.conf b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-pipeline-config.conf b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-pipeline-config.conf deleted file mode 100644 index d0bf6cccb..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::pedestrian-topologies-scala" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-config.conf b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-job.conf b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-job.conf deleted file mode 100644 index 71f720be2..000000000 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - rib { - processing-type = "reprocess" - version = 0 - } - } -} diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/project/Dependencies.scala b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/project/Dependencies.scala index 79c6a6aab..86342a9cd 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/project/Dependencies.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/project/Dependencies.scala @@ -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. @@ -31,7 +31,7 @@ case class Dependencies(platformBom: Bom) { "commons-io" % "commons-io" % platformBom, "org.apache.spark" %% "spark-core" % platformBom, // output data schema - "com.here.platform.schema.data.processing.example.scala.pedestrian.protobuf" %% "model_v2_scala" % "0.0.861" + "com.here.platform.schema.data.processing.example.scala.pedestrian.protobuf" %% "model_v2_scala" % "0.0.865" ) } diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/project/plugins.sbt b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/project/plugins.sbt +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Compiler.scala b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Compiler.scala index be0ef2f89..06b2a4805 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Compiler.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Compiler.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/CompilerConfig.scala b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/CompilerConfig.scala index 50d181723..abfeefead 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/CompilerConfig.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/CompilerConfig.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Defs.scala b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Defs.scala index 0750c9521..00feb814f 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Defs.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Defs.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Main.scala b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Main.scala index 531d1cddb..f0c37ce72 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Main.scala +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/compiler/src/main/scala/com/here/platform/data/processing/example/scala/pedestrian/protobuf/Main.scala @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/ds/pom.xml b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/ds/pom.xml index 0d45618b9..3a0d14cd4 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/ds/pom.xml +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/ds/pom.xml @@ -5,7 +5,7 @@ com.here.platform.schema.data.processing.example.scala.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 model_v2_ds @@ -28,7 +28,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/java/pom.xml b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/java/pom.xml index ae07fc47d..90149549b 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/java/pom.xml +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/java/pom.xml @@ -5,7 +5,7 @@ com.here.platform.schema.data.processing.example.scala.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 model_v2_java @@ -28,7 +28,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/pom.xml b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/pom.xml index 9e1897efa..b9cafcd41 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/pom.xml +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/pom.xml @@ -4,7 +4,7 @@ com.here.platform.schema.data.processing.example.scala.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 pom Pedestrian Topologies Extraction Example Scala @@ -34,7 +34,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 @@ -56,7 +56,7 @@ 3.11.4 2.1.18 2.0.21 - 2.58.2 + 2.59.2 2.12 diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/proto/pom.xml b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/proto/pom.xml index 346739816..47ffc98c4 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/proto/pom.xml +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/proto/pom.xml @@ -5,7 +5,7 @@ com.here.platform.schema.data.processing.example.scala.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 model_v2_proto @@ -28,7 +28,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/proto/src/main/proto/com/here/platform/schema/data/processing/example/scala/pedestrian/protobuf/model/v2/model.proto b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/proto/src/main/proto/com/here/platform/schema/data/processing/example/scala/pedestrian/protobuf/model/v2/model.proto index 2192f4e53..94d5228f1 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/proto/src/main/proto/com/here/platform/schema/data/processing/example/scala/pedestrian/protobuf/model/v2/model.proto +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/proto/src/main/proto/com/here/platform/schema/data/processing/example/scala/pedestrian/protobuf/model/v2/model.proto @@ -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. diff --git a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/scala/pom.xml b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/scala/pom.xml index 80fe3a0e1..caf77f508 100644 --- a/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/scala/pom.xml +++ b/data-processing/scala/pedestrian-topologies-extraction-protobuf/model/scala/pom.xml @@ -5,7 +5,7 @@ com.here.platform.schema.data.processing.example.scala.pedestrian.protobuf model_v2 - 0.0.861 + 0.0.865 model_v2_scala_2.12 @@ -28,7 +28,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/data-processing/scala/stateful-nodecardinality-extraction/README.md b/data-processing/scala/stateful-nodecardinality-extraction/README.md index b24584ea6..9dc9f01ef 100644 --- a/data-processing/scala/stateful-nodecardinality-extraction/README.md +++ b/data-processing/scala/stateful-nodecardinality-extraction/README.md @@ -48,7 +48,7 @@ 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). - `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command). -- `$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. @@ -115,14 +115,11 @@ job-specific versions of the catalogs, to read and write to. The example project provides two template job configurations, [`config/here/pipeline-job-first.conf`](config/here/pipeline-job-first.conf) and [`config/here/pipeline-job-second.conf`](config/here/pipeline-job-second.conf) for the first and second run of the pipeline, respectively. -If you are using the HERE platform environment in China, use the files [`config/here-china/pipeline-job-first.conf`](config/here-china/pipeline-job-first.conf) -and [`config/here-china/pipeline-job-second.conf`](config/here-china/pipeline-job-second.conf) instead. [`pipeline-job-first.conf`](config/here/pipeline-job-first.conf) specifies in the line `version = 1` that the version 1 of the input catalog should be processed in the first run. You can change this version to any number between 0 and the most recent version of the HERE Map Content catalog. You can find the most recent version by -opening the [HERE platform portal](https://platform.here.com/) or the -[HERE platform portal in China](https://platform.hereolp.cn/) and navigating to the `HERE Map Content` catalog, and viewing the current catalog's version in the `Catalog info` section. +opening the [HERE platform portal](https://platform.here.com/) and navigating to the `HERE Map Content` catalog, and viewing the current catalog's version in the `Catalog info` section. [`pipeline-job-second.conf`](config/here/pipeline-job-second.conf) specifies in the line `version = 2` that version 2 of the input catalog should be processed in the second run. You can change this version to any number that is @@ -130,16 +127,14 @@ less than or equal to the most recent version of the HERE Map Content catalog an specified in [`config/here/pipeline-job-first.conf`](config/here/pipeline-job-first.conf). 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). Finally, execute the following command in the [`stateful-nodecardinality-extraction`](../stateful-nodecardinality-extraction) directory to run The Stateful Processing Compiler. @@ -154,16 +149,6 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -sbt run \ --Dpipeline-config.file=./config/china-here/local-pipeline-config.conf \ --Dpipeline-job.file=./config/china-here/pipeline-job-first.conf \ --Dconfig.file=./config/china-here/local-application.conf \ --Dspark.master=local[*] -``` - To observe the behavior of the Stateful Processing Compiler, you have to run the compiler again using [`pipeline-job-second.conf`](config/here/pipeline-job-second.conf) as job configuration: @@ -177,16 +162,6 @@ sbt run \ -Dspark.master=local[*] ``` -For the HERE platform environment for China: - -``` -sbt run \ --Dpipeline-config.file=./config/china-here/local-pipeline-config.conf \ --Dpipeline-job.file=./config/china-here/pipeline-job-second.conf \ --Dconfig.file=./config/china-here/local-application.conf \ --Dspark.master=local[*] -``` - After the second run, in the HERE platform environment, you can inspect the local catalog with the OLP CLI: ``` @@ -198,16 +173,13 @@ The field `updatesCount` will be `1` for those partitions that did not change du ![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 To follow this example, you will need a [project](https://developer.here.com/documentation/identity-access-management/dev_guide/topics/manage-projects.html). A project is a collection of platform resources (catalogs, pipelines, and schemas) with controlled access. You can create a project through the -[HERE platform portal](https://platform.here.com/) / [HERE platform portal in China](https://platform.hereolp.cn/). +[HERE platform portal](https://platform.here.com/). Alternatively, use the OLP CLI [`olp project create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html#create-project) command to create the project: @@ -270,8 +242,7 @@ olp project resource link $PROJECT_HRN $CATALOG_RIB From the SDK examples directory, open the `data-processing/scala/stateful-nodecardinality-extraction` project in your Integrated Development Environment (IDE). -The `config/here/pipeline-config.conf` (for the HERE platform environment) and -`config/here-china/pipeline-config.conf` (for the HERE platform environment in China) files contain +The `config/here/pipeline-config.conf` (for the HERE platform environment) file contains the permanent configuration of the data sources for the compiler. Pick the file that corresponds to your platform environemnt. For example, the pipeline configuration for @@ -287,15 +258,14 @@ pipeline.config { ``` Replace `YOUR_OUTPUT_CATALOG_HRN` with the HRN of your nodecardinality 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 +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-first.conf` and `config/here/pipeline-second.conf` files contain the compiler's run configuration and point to two different versions of the HERE Map Content Catalog. -To find the latest version of the HERE Map Content catalog, in the [HERE platform portal](https://platform.here.com/) -or the [HERE platform portal in China](https://platform.hereolp.cn/), navigate to the HERE Map Content catalog, and view the current catalog's version in the Catalog info section. +To find the latest version of the HERE Map Content catalog, in the [HERE platform portal](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 `src/main/resources` directory of the compiler project. However, you do not have to modify it unless @@ -313,8 +283,7 @@ sbt assembly #### 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 pipeline UI](https://platform.here.com/pipelines) (the -[HERE pipeline UI](https://platform.hereolp.cn/pipelines) in China) +can upload it using the [HERE pipeline 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: @@ -323,8 +292,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. @@ -355,12 +323,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 `nodecardinality-count` layer and select the **Inspect** tab. Verify that partitions diff --git a/data-processing/scala/stateful-nodecardinality-extraction/build.sbt b/data-processing/scala/stateful-nodecardinality-extraction/build.sbt index 94dad7ec1..4370a97cf 100644 --- a/data-processing/scala/stateful-nodecardinality-extraction/build.sbt +++ b/data-processing/scala/stateful-nodecardinality-extraction/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.data.processing.example.scala" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn @@ -25,7 +25,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/local-application.conf b/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/local-application.conf deleted file mode 100644 index 7826af51f..000000000 --- a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/local-application.conf +++ /dev/null @@ -1,16 +0,0 @@ -include "application" - -here.platform.data-processing.executors.partitionKeyFilters = [ - { - className = "BoundingBoxFilter" - param = { - boundingBox { - // Beijing - north = 40.158941 - south = 39.7704 - east = 116.60867 - west = 116.170955 - } - } - } -] diff --git a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/local-pipeline-config.conf b/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/local-pipeline-config.conf deleted file mode 100644 index dfc8831a0..000000000 --- a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "hrn:local:data:::stateful-compiler-scala" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-config.conf b/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-config.conf deleted file mode 100644 index 842a61e99..000000000 --- a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.config { - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } - - input-catalogs { - rib { hrn = "hrn:here-cn:data::olp-cn-here:here-map-content-china-2" } - } - -} diff --git a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-job-first.conf b/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-job-first.conf deleted file mode 100644 index 664e8afed..000000000 --- a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-job-first.conf +++ /dev/null @@ -1,18 +0,0 @@ -// This configuration file is meant to facilitate the local development -// Please refer to the HERE Data SDK documentation for more information -// -// This file is not supposed to be included in the pipeline JAR. -// For local development, it may be passed to the pipeline using -// -// -Dpipeline-job.file=config/here-china/pipeline-job-first.conf - -pipeline.job.catalog-versions { - - input-catalogs { - - rib { - processing-type = "reprocess" - version = 0 - } - } -} diff --git a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-job-second.conf b/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-job-second.conf deleted file mode 100644 index d555dfe32..000000000 --- a/data-processing/scala/stateful-nodecardinality-extraction/config/here-china/pipeline-job-second.conf +++ /dev/null @@ -1,18 +0,0 @@ -// This configuration file is meant to facilitate the local development -// Please refer to the HERE Data SDK documentation for more information -// -// This file is not supposed to be included in the pipeline JAR. -// For local development, it may be passed to the pipeline using -// -// -Dpipeline-job.file=config/here-china/pipeline-job-second.conf - -pipeline.job.catalog-versions { - - input-catalogs { - - rib { - processing-type = "reprocess" - version = 1 - } - } -} diff --git a/data-processing/scala/stateful-nodecardinality-extraction/project/Dependencies.scala b/data-processing/scala/stateful-nodecardinality-extraction/project/Dependencies.scala index b773db2b1..0ffa0704e 100644 --- a/data-processing/scala/stateful-nodecardinality-extraction/project/Dependencies.scala +++ b/data-processing/scala/stateful-nodecardinality-extraction/project/Dependencies.scala @@ -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. diff --git a/data-processing/scala/stateful-nodecardinality-extraction/project/plugins.sbt b/data-processing/scala/stateful-nodecardinality-extraction/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/data-processing/scala/stateful-nodecardinality-extraction/project/plugins.sbt +++ b/data-processing/scala/stateful-nodecardinality-extraction/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/Compiler.scala b/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/Compiler.scala index ae5216212..741440a59 100644 --- a/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/Compiler.scala +++ b/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/Compiler.scala @@ -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. diff --git a/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/LayerCatalogDefs.scala b/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/LayerCatalogDefs.scala index fdb8828c0..44b0e49eb 100644 --- a/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/LayerCatalogDefs.scala +++ b/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/LayerCatalogDefs.scala @@ -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. diff --git a/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/Main.scala b/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/Main.scala index c7eb832bf..365c9deb6 100644 --- a/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/Main.scala +++ b/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/Main.scala @@ -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. diff --git a/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/NodeCardinalityRunCounter.scala b/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/NodeCardinalityRunCounter.scala index ed718e2fa..c39ad096e 100644 --- a/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/NodeCardinalityRunCounter.scala +++ b/data-processing/scala/stateful-nodecardinality-extraction/src/main/scala/com/here/platform/data/processing/example/scala/feedback/NodeCardinalityRunCounter.scala @@ -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. diff --git a/index-compaction-batch/java/parquet-example/pom.xml b/index-compaction-batch/java/parquet-example/pom.xml index d1397c192..4817b3ff1 100644 --- a/index-compaction-batch/java/parquet-example/pom.xml +++ b/index-compaction-batch/java/parquet-example/pom.xml @@ -4,7 +4,7 @@ com.here.platform.index.compaction.batch index-compaction-batch-parquet-example - 0.0.861 + 0.0.865 jar Index Compaction Batch Parquet Example @@ -24,14 +24,14 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 UTF-8 1.8 - 2.58.2 + 2.59.2 2.12 2.0.21 diff --git a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/Main.java b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/Main.java index 6c018a33a..898ad08cb 100644 --- a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/Main.java +++ b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/Main.java @@ -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. diff --git a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/ParquetCompactionExample.java b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/ParquetCompactionExample.java index 6afb19056..b1b5053f1 100644 --- a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/ParquetCompactionExample.java +++ b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/ParquetCompactionExample.java @@ -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. diff --git a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/CustomProtoSchemaConverter.java b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/CustomProtoSchemaConverter.java index 727fe5602..918e36468 100644 --- a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/CustomProtoSchemaConverter.java +++ b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/CustomProtoSchemaConverter.java @@ -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 diff --git a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/CustomProtoWriteSupport.java b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/CustomProtoWriteSupport.java index cb5c381c0..95c749755 100644 --- a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/CustomProtoWriteSupport.java +++ b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/CustomProtoWriteSupport.java @@ -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 diff --git a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/SdiiMessageParquetWriterBuilder.java b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/SdiiMessageParquetWriterBuilder.java index d86f7bf65..49b84121d 100644 --- a/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/SdiiMessageParquetWriterBuilder.java +++ b/index-compaction-batch/java/parquet-example/src/main/java/com/here/platform/index/compaction/batch/util/SdiiMessageParquetWriterBuilder.java @@ -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. diff --git a/index-compaction-batch/java/protobuf-example/pom.xml b/index-compaction-batch/java/protobuf-example/pom.xml index 740084998..79d76a213 100644 --- a/index-compaction-batch/java/protobuf-example/pom.xml +++ b/index-compaction-batch/java/protobuf-example/pom.xml @@ -4,7 +4,7 @@ com.here.platform.index.compaction.batch index-compaction-batch-protobuf-example - 0.0.861 + 0.0.865 jar Index Compaction Batch Protobuf Example @@ -24,14 +24,14 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 UTF-8 1.8 - 2.58.2 + 2.59.2 2.12 2.0.21 diff --git a/index-compaction-batch/java/protobuf-example/src/main/java/com/here/platform/index/compaction/batch/Main.java b/index-compaction-batch/java/protobuf-example/src/main/java/com/here/platform/index/compaction/batch/Main.java index 6c018a33a..898ad08cb 100644 --- a/index-compaction-batch/java/protobuf-example/src/main/java/com/here/platform/index/compaction/batch/Main.java +++ b/index-compaction-batch/java/protobuf-example/src/main/java/com/here/platform/index/compaction/batch/Main.java @@ -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. diff --git a/index-compaction-batch/java/protobuf-example/src/main/java/com/here/platform/index/compaction/batch/ProtobufCompactionExample.java b/index-compaction-batch/java/protobuf-example/src/main/java/com/here/platform/index/compaction/batch/ProtobufCompactionExample.java index 29032a67b..fdfed60a0 100644 --- a/index-compaction-batch/java/protobuf-example/src/main/java/com/here/platform/index/compaction/batch/ProtobufCompactionExample.java +++ b/index-compaction-batch/java/protobuf-example/src/main/java/com/here/platform/index/compaction/batch/ProtobufCompactionExample.java @@ -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. diff --git a/location/README.md b/location/README.md index d5bd4a9ae..4ee8694e0 100644 --- a/location/README.md +++ b/location/README.md @@ -29,8 +29,7 @@ _Location Library_ examples. The examples require you to create catalogs and layers in these catalogs. For instructions on how to create layers, see the related section in the -[Data User Guide](https://developer.here.com/documentation/data-user-guide/portal/layer-creating.html) -or the [China Data User Guide](https://developer.here.com/cn/documentation/data-user-guide/portal/layer-creating.html). +[Data User Guide](https://developer.here.com/documentation/data-user-guide/portal/layer-creating.html). ### Access to Catalogs @@ -42,13 +41,12 @@ a file containing your credentials on your computer. For more information, see t If you are running the examples in a pipeline on the platform, you also have to share the catalogs with your group so that the examples can access the data. You -can get this group ID on your [Profile](https://platform.here.com/profile/) -or your [China Profile](https://platform.hereolp.cn/profile/) page. +can get this group ID on your [Profile](https://platform.here.com/profile/). ### Run Pipelines on the Platform To create a pipeline, you need to provide a group ID. You can get this group ID -on your [Profile](https://platform.here.com/profile/) or your [China Profile](https://platform.hereolp.cn/profile/) page. +on your [Profile](https://platform.here.com/profile/). Note that your app must be part of that group. If you or your app do not belong to a group, ask the administrator for your team or organization to assign you or @@ -59,8 +57,7 @@ your app to a group. The creation of platform resources (catalogs, pipelines, etc.) is conveniently achievable by means of the OLP Command Line Interface, see -[OLP CLI](https://developer.here.com/documentation/open-location-platform-cli/user_guide/index.html) or -[OLP China CLI](https://developer.here.com/cn/documentation/open-location-platform-cli/user_guide/index.html). +[OLP CLI](https://developer.here.com/documentation/open-location-platform-cli/user_guide/index.html). Examples documentation only refers to the `olp` command line tool. If you are on Windows, always replace `olp` with `olp.bat`. @@ -85,8 +82,7 @@ Make sure that you have followed the instructions on how to You probably need to share your catalog, for example, with the HERE platform group you are part of or app that you have credentials for. For more information, see the platform documentation on how to -[Share a Catalog](https://developer.here.com/documentation/data-user-guide/portal/catalog-sharing.html) or -[Share a China Catalog](https://developer.here.com/cn/documentation/data-user-guide/portal/catalog-sharing.html). +[Share a Catalog](https://developer.here.com/documentation/data-user-guide/portal/catalog-sharing.html). ### I get `com.typesafe.config.ConfigException$Missing: No configuration setting found for key 'here.token'` diff --git a/location/java/flink/stream-path-matcher/README.md b/location/java/flink/stream-path-matcher/README.md index 3c42183b3..05ee60351 100644 --- a/location/java/flink/stream-path-matcher/README.md +++ b/location/java/flink/stream-path-matcher/README.md @@ -5,8 +5,7 @@ This example shows how to exercise the path matching functionality of the The example map-matches data coming from the `sample-streaming-layer` that contains SDII messages. The catalog that contains this layer is defined in the -`sdii-catalog` entry in [`config/here/pipeline-config.conf`](./config/here/pipeline-config.conf) or -[`config/here-china/pipeline-config.conf`](./config/here-china/pipeline-config.conf) for China. The example writes the +`sdii-catalog` entry in [`config/here/pipeline-config.conf`](./config/here/pipeline-config.conf). The example writes the result of the computation to the `out-data` streaming layer in the catalog you will create. @@ -29,30 +28,33 @@ examples. To run the example, you need access to the following catalogs: - [`HERE Optimized Map for Location Library`](https://platform.here.com/data/hrn:here:data::olp-here:here-optimized-map-for-location-library-2) - or China specific [`HERE Optimized Map for Location Library`](https://platform.hereolp.cn/data/hrn:here-cn:data::olp-cn-here:here-optimized-map-for-location-library-china-2) - catalog - [`HERE Sample SDII Messages - Berlin`](https://platform.here.com/data/hrn:here:data::olp-here:olp-sdii-sample-berlin-2) - or [`HERE Sample SDII Messages - China`](https://platform.hereolp.cn/data/hrn:here-cn:data::olp-cn-here:sample-data) ## Get Your Credentials To run this example, you need two sets of credentials: - **Platform credentials:** To get access to platform data and resources. -- **Repository credentials:** To download HERE Data SDK for Java & Scala libraries and Maven archetypes to your environment. +- **Repository credentials:** To download HERE Data SDK for Java & Scala libraries and Maven archetypes to your + environment. -For more details on how to set up your credentials, see the [Identity & Access Management Developer Guide](https://developer.here.com/documentation/identity-access-management/dev_guide/index.html). +For more details on how to set up your credentials, see +the [Identity & Access Management Developer Guide](https://developer.here.com/documentation/identity-access-management/dev_guide/index.html). -For more details on how to verify that your platform credentials are configured correctly, see the [Verify Your Credentials](https://developer.here.com/documentation/java-scala-dev/dev_guide/verify-credentials/index.html) tutorial. +For more details on how to verify that your platform credentials are configured correctly, see +the [Verify Your Credentials](https://developer.here.com/documentation/java-scala-dev/dev_guide/verify-credentials/index.html) +tutorial. ## Build and Run the Compiler In the commands that follow, replace the variable placeholders with the following values: - `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command). -- `$COVERAGE` is a two-letter code for country and region (in this case, `DE` for Germany or `CN` for China) -- `$INPUT_SDII_CATALOG` is the HRN of the public _sdii-catalog_ catalog in your pipeline configuration ([HERE environment](./config/here/local-pipeline-config.conf) or [HERE environment in China](./config/here-china/local-pipeline-config.conf). -- `$INPUT_OPTIMIZED_MAP_CATALOG` is the HRN of the public _optimized-map-catalog_ catalog in your pipeline configuration ([HERE environment](./config/here/local-pipeline-config.conf) or [HERE environment in China](./config/here-china/local-pipeline-config.conf). +- `$COVERAGE` is a two-letter code for country and region (in this case, `DE` for Germany) +- `$INPUT_SDII_CATALOG` is the HRN of the public _sdii-catalog_ catalog in your pipeline + configuration ([HERE environment](./config/here/local-pipeline-config.conf). +- `$INPUT_OPTIMIZED_MAP_CATALOG` is the HRN of the public _optimized-map-catalog_ catalog in your pipeline + configuration ([HERE environment](./config/here/local-pipeline-config.conf). > Note: > We recommend that you set values to variables, so that you can easily copy and execute the following commands. @@ -61,14 +63,16 @@ In the commands that follow, replace the variable placeholders with the followin #### Create a Local Output Catalog -As mentioned above we will use two public input catalogs, however we need to create our own output catalog to store the results of the `Stream Path Matcher` example. +As mentioned above we will use two public input catalogs, however we need to create our own output catalog to store the +results of the `Stream Path Matcher` example. To run this compiler locally, use a local output catalog as described below. For more information about local catalogs, see [the SDK tutorial about local development and testing](https://developer.here.com/documentation/java-scala-dev/dev_guide/local-development-workflow/index.html) and [the OLP CLI documentation](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data-workflows.html). -1. Use the [`olp local catalog create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data/catalog-commands.html#catalog-create) +1. Use + the [`olp local catalog create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data/catalog-commands.html#catalog-create) command to create a local catalog. ```bash @@ -78,7 +82,8 @@ olp local catalog create path-matcher-java path-matcher-java --summary "Output c The local catalog will have the HRN `hrn:local:data:::path-matcher-java`. -2. Use the [`olp local catalog layer add`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data/layer-commands.html#catalog-layer-add) +2. Use + the [`olp local catalog layer add`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data/layer-commands.html#catalog-layer-add) command to add one `stream` layer to your catalog: ```bash @@ -102,16 +107,9 @@ mvn compile exec:java -Dexec.mainClass=com.here.platform.example.location.java.f -Dpipeline-job.file=config/here/pipeline-job.conf ``` -For the HERE platform environment for China: - -``` -mvn compile exec:java -Dexec.mainClass=com.here.platform.example.location.java.flink.StreamPathMatcherExample \ - -Dpipeline-config.file=config/here-china/local-pipeline-config.conf \ - -Dpipeline-job.file=config/here-china/pipeline-job.conf -``` - 2. Open a different terminal and let a few partitions stream out of the layer. They consist of small, one-line messages. - The following command prints `10` messages specified by the `--limit` parameter or messages coming within `900` seconds separated by `--delimeter=\\n` parameter. + The following command prints `10` messages specified by the `--limit` parameter or messages coming within `900` + seconds separated by `--delimeter=\\n` parameter. ```bash olp local catalog layer stream get hrn:local:data:::path-matcher-java out-data --delimiter=\\n --limit=10 --timeout=900 @@ -139,39 +137,53 @@ Result for id bd69c6c6-4d0b-419d-9ae2-51fb0d7365c7: matched 72 points out of 72 #### Configure a Project -To follow this example, you will need a [project](https://developer.here.com/documentation/identity-access-management/dev_guide/topics/manage-projects.html). A project is a collection of platform resources +To follow this example, you will need +a [project](https://developer.here.com/documentation/identity-access-management/dev_guide/topics/manage-projects.html). +A project is a collection of platform resources (catalogs, pipelines, and schemas) with controlled access. You can create a project through the platform portal. -Alternatively, use the OLP CLI [`olp project create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html#create-project) command to create the project: +Alternatively, use the OLP +CLI [`olp project create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html#create-project) +command to create the project: ```bash olp project create $PROJECT_ID $PROJECT_NAME ``` -The command returns the [HERE Resource Name (HRN)](https://developer.here.com/documentation/data-user-guide/user_guide/index.html) of your new project. Note down this HRN as you will need it later in this tutorial. +The command returns +the [HERE Resource Name (HRN)](https://developer.here.com/documentation/data-user-guide/user_guide/index.html) of your +new project. Note down this HRN as you will need it later in this tutorial. > #### Note > > You do not have to provide a `--scope` parameter if your app has a default scope. > For details on how to set a default project scope for an app, see the _Specify a -> default Project_ for Apps chapter of the [Identity & Access Management Developer Guide](https://developer.here.com/documentation/identity-access-management/dev_guide/index.html). +> default Project_ for Apps chapter of +> the [Identity & Access Management Developer Guide](https://developer.here.com/documentation/identity-access-management/dev_guide/index.html). -For more information on how to work with projects, see the [Organize your work in projects](https://developer.here.com/documentation/java-scala-dev/dev_guide/organize-work-in-projects/index.html) tutorial. +For more information on how to work with projects, see +the [Organize your work in projects](https://developer.here.com/documentation/java-scala-dev/dev_guide/organize-work-in-projects/index.html) +tutorial. #### Create an Output Catalog The catalog you need to create is used to store the results of the `Stream Path Matcher` example. -Use the [HERE platform portal](https://platform.here.com/) to [create the output catalog](https://developer.here.com/documentation/data-user-guide/user_guide/portal/catalog-creating.html) in your project and [add the following layers](https://developer.here.com/documentation/data-user-guide/user_guide/portal/layer-creating.html): +Use the [HERE platform portal](https://platform.here.com/) +to [create the output catalog](https://developer.here.com/documentation/data-user-guide/user_guide/portal/catalog-creating.html) +in your project +and [add the following layers](https://developer.here.com/documentation/data-user-guide/user_guide/portal/layer-creating.html): | Layer ID | Layer Type | Content Type | Content Encoding | Coverage | | -------- | ---------- | ---------------------- | ---------------- | -------- | -| out-data | Stream | application/x-protobuf | uncompressed | DE or CN | +| out-data | Stream | application/x-protobuf | uncompressed | DE | Alternatively, you can use the OLP CLI to create the catalog and the corresponding layers. -1. Use the [`olp catalog create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/catalog-commands.html#catalog-create) command to create the catalog. +1. Use + the [`olp catalog create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/catalog-commands.html#catalog-create) + command to create the catalog. Make sure to note down the HRN returned by the following command for later use: ```bash @@ -180,7 +192,9 @@ olp catalog create $CATALOG_ID $CATALOG_ID --summary "Output catalog for Stream --scope $PROJECT_HRN ``` -2. Use the [`olp catalog layer add`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/layer-commands.html#catalog-layer-add) command to add a stream layer to your catalog: +2. Use + the [`olp catalog layer add`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/layer-commands.html#catalog-layer-add) + command to add a stream layer to your catalog: ```bash olp catalog layer add $CATALOG_HRN out-data out-data --stream --summary "Layer for output partitions" \ @@ -194,27 +208,34 @@ olp catalog layer add $CATALOG_HRN out-data out-data --stream --summary "Layer f 3. Update the output catalog HRN in the `pipeline-config.conf` file -The `config/here/pipeline-config.conf` (for the HERE platform environment) and -`config/here-china/pipeline-config.conf` (for the HERE platform environment in China) files contain +The `config/here/pipeline-config.conf` (for the HERE platform environment) file contains the permanent configuration of the data sources for the example. Pick the file that corresponds to your platform environment and replace `YOUR_OUTPUT_CATALOG_HRN` placeholder with the HRN of your Stream Path Matcher 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 +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. -4. Use the [`olp project resource link`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-link-commands.html#project-resource-link) command to link the _HERE Sample SDII Messages - Berlin_ and _HERE Optimized Map for Location Library_ catalog to your project. +4. Use + the [`olp project resource link`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-link-commands.html#project-resource-link) + command to link the _HERE Sample SDII Messages - Berlin_ and _HERE Optimized Map for Location Library_ catalog to + your project. ```bash olp project resource link $PROJECT_HRN $INPUT_SDII_CATALOG olp project resource link $PROJECT_HRN $INPUT_OPTIMIZED_MAP_CATALOG ``` -- For more details on catalog commands, see [Catalog Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/catalog-commands.html). -- For more details on layer commands, see [Layer Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/layer-commands.html). -- For more details on project commands, see [Project Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html). -- For instructions on how to link a resource to a project, see [Project Resource Link command](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-link-commands.html#project-resource-link). +- For more details on catalog commands, + see [Catalog Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/catalog-commands.html). +- For more details on layer commands, + see [Layer Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/layer-commands.html). +- For more details on project commands, + see [Project Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html). +- For instructions on how to link a resource to a project, + see [Project Resource Link command](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-link-commands.html#project-resource-link). #### Generate a Fat JAR file @@ -228,7 +249,8 @@ mvn -Pplatform package You can use the OLP CLI to create pipeline components and activate the pipeline version with the following commands: -1. [Create](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/pipeline-workflows.html) pipeline components: +1. [Create](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/pipeline-workflows.html) + pipeline components: ```bash olp pipeline create $COMPONENT_NAME_Pipeline --scope $PROJECT_HRN @@ -256,7 +278,8 @@ olp pipeline version log level get $PIPELINE_ID $PIPELINE_VERSION_ID \ --scope $PROJECT_HRN ``` -2. [Activate](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/pipeline/version-commands.html#pipeline-version-activate) the pipeline version: +2. [Activate](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/pipeline/version-commands.html#pipeline-version-activate) + the pipeline version: ```bash olp pipeline version activate $PIPELINE_ID $PIPELINE_VERSION_ID --input-catalogs "$PATH_TO_CONFIG_FOLDER/pipeline-job.conf" --scope $PROJECT_HRN @@ -273,7 +296,8 @@ olp pipeline version cancel $PIPELINE_ID $PIPELINE_VERSION_ID --scope $PROJECT_H Partitions consist of small, one-line messages. -The following command prints `10` messages specified by the `--limit` parameter or messages coming within `900` seconds separated by `--delimeter=\\n` parameter. +The following command prints `10` messages specified by the `--limit` parameter or messages coming within `900` seconds +separated by `--delimeter=\\n` parameter. ```bash olp catalog layer stream get $CATALOG_HRN out-data --delimiter=\\n --limit=10 --timeout=900 --scope $PROJECT_HRN diff --git a/location/java/flink/stream-path-matcher/config/here-china/local-pipeline-config.conf b/location/java/flink/stream-path-matcher/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 454e726ce..000000000 --- a/location/java/flink/stream-path-matcher/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,16 +0,0 @@ -// This configuration file is meant to facilitate the local development -// Please refer to the HERE Data SDK documentation for more information -// -// This file is not supposed to be included in the pipeline JAR. -// For local development, it may be passed to the pipeline using: -// -Dpipeline-config.file=config/here-china/pipeline-config.conf - -pipeline.config { - - input-catalogs { - sdii-catalog { hrn = "hrn:here-cn:data::olp-cn-here:sample-data" } - optimized-map-catalog { hrn = "hrn:here-cn:data::olp-cn-here:here-optimized-map-for-location-library-china-2" } - } - - output-catalog { hrn = "hrn:local:data:::path-matcher-java" } -} diff --git a/location/java/flink/stream-path-matcher/config/here-china/pipeline-config.conf b/location/java/flink/stream-path-matcher/config/here-china/pipeline-config.conf deleted file mode 100644 index 35ca7b36f..000000000 --- a/location/java/flink/stream-path-matcher/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,16 +0,0 @@ -// This configuration file is meant to facilitate the local development -// Please refer to the HERE Data SDK documentation for more information -// -// This file is not supposed to be included in the pipeline JAR. -// For local development, it may be passed to the pipeline using: -// -Dpipeline-config.file=config/here-china/pipeline-config.conf - -pipeline.config { - - input-catalogs { - sdii-catalog { hrn = "hrn:here-cn:data::olp-cn-here:sample-data" } - optimized-map-catalog { hrn = "hrn:here-cn:data::olp-cn-here:here-optimized-map-for-location-library-china-2" } - } - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } -} diff --git a/location/java/flink/stream-path-matcher/config/here-china/pipeline-job.conf b/location/java/flink/stream-path-matcher/config/here-china/pipeline-job.conf deleted file mode 100644 index b5bb3b823..000000000 --- a/location/java/flink/stream-path-matcher/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,8 +0,0 @@ -pipeline.job.catalog-versions { - input-catalogs { - optimized-map-catalog { - processing-type = "reprocess" - version = 2 - } - } -} diff --git a/location/java/flink/stream-path-matcher/pom.xml b/location/java/flink/stream-path-matcher/pom.xml index 58173b45c..792bf1cfb 100644 --- a/location/java/flink/stream-path-matcher/pom.xml +++ b/location/java/flink/stream-path-matcher/pom.xml @@ -5,13 +5,13 @@ com.here.platform sdk-stream-bom_2.12 - 2.58.2 + 2.59.2 com.here.platform.example.location java-flink-stream-path-matcher - 0.0.861 + 0.0.865 jar Location Library Examples - Java - Flink - Stream Path Matcher @@ -30,7 +30,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/MatchedTrip.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/MatchedTrip.java index 2bfbdbe41..15c00f3b3 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/MatchedTrip.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/MatchedTrip.java @@ -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. diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/OptimisedMapLayersAccess.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/OptimisedMapLayersAccess.java index 1da33a3dc..393547806 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/OptimisedMapLayersAccess.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/OptimisedMapLayersAccess.java @@ -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. diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/OptimizedMapLayersSingleton.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/OptimizedMapLayersSingleton.java index 7e718e9d4..4c0cd438d 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/OptimizedMapLayersSingleton.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/OptimizedMapLayersSingleton.java @@ -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. diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/PathMatcherMapFunction.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/PathMatcherMapFunction.java index 4b1282e70..2a8dd8c2e 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/PathMatcherMapFunction.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/PathMatcherMapFunction.java @@ -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. diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/PositionEstimateGeoCoordinateAdapter.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/PositionEstimateGeoCoordinateAdapter.java index 51df1b824..926be3d4e 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/PositionEstimateGeoCoordinateAdapter.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/PositionEstimateGeoCoordinateAdapter.java @@ -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. diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/SdiiMessageMapFunction.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/SdiiMessageMapFunction.java index 8d108c6bc..7bab75e37 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/SdiiMessageMapFunction.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/SdiiMessageMapFunction.java @@ -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. diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/StreamPathMatcherExample.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/StreamPathMatcherExample.java index be19dbd09..952096a1f 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/StreamPathMatcherExample.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/StreamPathMatcherExample.java @@ -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. diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/TilePartitioner.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/TilePartitioner.java index 9d9407ddc..339290204 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/TilePartitioner.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/TilePartitioner.java @@ -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. diff --git a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/Utils.java b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/Utils.java index e3c13f311..5ca12e4b7 100644 --- a/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/Utils.java +++ b/location/java/flink/stream-path-matcher/src/main/java/com/here/platform/example/location/java/flink/Utils.java @@ -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. diff --git a/location/java/standalone/pom.xml b/location/java/standalone/pom.xml index 1cf31fcd3..3e0b4a747 100644 --- a/location/java/standalone/pom.xml +++ b/location/java/standalone/pom.xml @@ -5,13 +5,13 @@ com.here.platform sdk-standalone-bom_2.12 - 2.58.2 + 2.59.2 com.here.platform.example.location java-standalone - 0.0.861 + 0.0.865 jar Location Library Examples - Java - Standalone @@ -30,7 +30,7 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/AdasCurvatureAttributeExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/AdasCurvatureAttributeExample.java index 8eeea3285..166b49111 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/AdasCurvatureAttributeExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/AdasCurvatureAttributeExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/ConvertTpeg2ContainerExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/ConvertTpeg2ContainerExample.java index 35773cfa6..52994223b 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/ConvertTpeg2ContainerExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/ConvertTpeg2ContainerExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/ExtractSpecificTpeg2MessagesExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/ExtractSpecificTpeg2MessagesExample.java index 9ade37232..6c4b32136 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/ExtractSpecificTpeg2MessagesExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/ExtractSpecificTpeg2MessagesExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/FunctionalClassExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/FunctionalClassExample.java index 509481ae2..b45dc5e9a 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/FunctionalClassExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/FunctionalClassExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/GraphExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/GraphExample.java index 8ff4d21ef..031a6cb6e 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/GraphExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/GraphExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/HereMapContentToOptimizedMapTranslationExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/HereMapContentToOptimizedMapTranslationExample.java index 5462c8409..76a53baf1 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/HereMapContentToOptimizedMapTranslationExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/HereMapContentToOptimizedMapTranslationExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/MostProbablePathExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/MostProbablePathExample.java index a9350c970..b36f5c937 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/MostProbablePathExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/MostProbablePathExample.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2023 HERE Europe B.V. + * Copyright (C) 2017-2024 HERE Europe B.V. * * The following rights to redistribution and use the software example in * source and binary forms, with or without modification, are granted to diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OlrCreateReferenceFromHmcSegmentsExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OlrCreateReferenceFromHmcSegmentsExample.java index a4497302a..544637e01 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OlrCreateReferenceFromHmcSegmentsExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OlrCreateReferenceFromHmcSegmentsExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OlrResolveReferenceToHmcSegmentsExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OlrResolveReferenceToHmcSegmentsExample.java index c05f02524..b48a077f3 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OlrResolveReferenceToHmcSegmentsExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OlrResolveReferenceToHmcSegmentsExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OnTheFlyCompiledPropertyMapExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OnTheFlyCompiledPropertyMapExample.java index b5e52a2d2..b1f35fd61 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OnTheFlyCompiledPropertyMapExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/OnTheFlyCompiledPropertyMapExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/PathMatcherExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/PathMatcherExample.java index 3c53550e9..62f4b1420 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/PathMatcherExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/PathMatcherExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/PointMatcherExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/PointMatcherExample.java index 34be1cc2d..128bdd0f1 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/PointMatcherExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/PointMatcherExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/SparsePathMatcherExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/SparsePathMatcherExample.java index 624384fde..f621db81f 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/SparsePathMatcherExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/SparsePathMatcherExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TmcCreateAndResolveExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TmcCreateAndResolveExample.java index 2f95c0f9b..6aafef9e7 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TmcCreateAndResolveExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TmcCreateAndResolveExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TmcResolveReferencesInRttiMessageExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TmcResolveReferencesInRttiMessageExample.java index 237f842ab..c53e5d27b 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TmcResolveReferencesInRttiMessageExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TmcResolveReferencesInRttiMessageExample.java @@ -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. diff --git a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TurnRestrictionsExample.java b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TurnRestrictionsExample.java index e6a32449e..cf6a2cc2b 100644 --- a/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TurnRestrictionsExample.java +++ b/location/java/standalone/src/main/java/com/here/platform/example/location/java/standalone/TurnRestrictionsExample.java @@ -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. diff --git a/location/pom.xml b/location/pom.xml index 4eb23e875..35bbc0d21 100644 --- a/location/pom.xml +++ b/location/pom.xml @@ -4,7 +4,7 @@ com.here.platform.example.location aggregator - 0.0.861 + 0.0.865 pom Location Library Examples @@ -28,6 +28,6 @@ scm:git:https://github.com/heremaps/here-workspace-examples-java-scala.git scm:git:git@github.com:heremaps/here-workspace-examples-java-scala.git https://github.com/heremaps/here-workspace-examples-java-scala - 2.58.2 + 2.59.2 diff --git a/location/scala/spark/infer-stop-signs-from-sensors/README.md b/location/scala/spark/infer-stop-signs-from-sensors/README.md index 2e457c216..b3b929197 100644 --- a/location/scala/spark/infer-stop-signs-from-sensors/README.md +++ b/location/scala/spark/infer-stop-signs-from-sensors/README.md @@ -50,30 +50,34 @@ examples. To run the example, you need access to the following catalogs: - [`HERE Optimized Map for Location Library`](https://platform.here.com/data/hrn:here:data::olp-here:here-optimized-map-for-location-library-2) - or China specific [`HERE Optimized Map for Location Library`](https://platform.hereolp.cn/data/hrn:here-cn:data::olp-cn-here:here-optimized-map-for-location-library-china-2) - catalog - [`HERE Sample SDII Messages - Berlin`](https://platform.here.com/data/hrn:here:data::olp-here:olp-sdii-sample-berlin-2) - or [`HERE Sample SDII Messages - China`](https://platform.hereolp.cn/data/hrn:here-cn:data::olp-cn-here:sample-data) ## Get Your Credentials To run this example, you need two sets of credentials: -- **Platform credentials:** To get access to platform data and resources, including HERE Map Content data for your pipeline input. -- **Repository credentials:** To download HERE Data SDK for Java & Scala libraries and Maven archetypes to your environment. +- **Platform credentials:** To get access to platform data and resources, including HERE Map Content data for your + pipeline input. +- **Repository credentials:** To download HERE Data SDK for Java & Scala libraries and Maven archetypes to your + environment. -For more details on how to set up your credentials, see [Identity & Access Management Developer Guide](https://developer.here.com/documentation/identity-access-management/dev_guide/index.html). +For more details on how to set up your credentials, +see [Identity & Access Management Developer Guide](https://developer.here.com/documentation/identity-access-management/dev_guide/index.html). -For more details on how to verify that your platform credentials are configured correctly, see the [Verify Your Credentials](https://developer.here.com/documentation/java-scala-dev/dev_guide/verify-credentials/index.html) tutorial. +For more details on how to verify that your platform credentials are configured correctly, see +the [Verify Your Credentials](https://developer.here.com/documentation/java-scala-dev/dev_guide/verify-credentials/index.html) +tutorial. ## Build and Run the Compiler In the commands that follow, replace the variable placeholders with the following values: - `$PROJECT_HRN` is your project's `HRN` (returned by the `olp project create` command). -- `$COVERAGE` is a two-letter code for country and region (in this case, `DE` for Germany or `CN` for China) -- `$INPUT_SDII_CATALOG` is the HRN of the public _sdii-catalog_ catalog in your pipeline configuration ([HERE environment](./config/here/local-pipeline-config.conf) or [HERE environment in China](./config/here-china/local-pipeline-config.conf). -- `$INPUT_OPTIMIZED_MAP_CATALOG` is the HRN of the public _optimized-map-catalog_ catalog in your pipeline configuration ([HERE environment](./config/here/local-pipeline-config.conf) or [HERE environment in China](./config/here-china/local-pipeline-config.conf). +- `$COVERAGE` is a two-letter code for country and region (in this case, `DE` for Germany) +- `$INPUT_SDII_CATALOG` is the HRN of the public _sdii-catalog_ catalog in your pipeline + configuration ([HERE environment](./config/here/local-pipeline-config.conf). +- `$INPUT_OPTIMIZED_MAP_CATALOG` is the HRN of the public _optimized-map-catalog_ catalog in your pipeline + configuration ([HERE environment](./config/here/local-pipeline-config.conf). > Note: > We recommend that you set values to variables, so that you can easily copy and execute the following commands. @@ -89,7 +93,8 @@ below. For more information about local catalogs, see [the SDK tutorial about local development and testing](https://developer.here.com/documentation/java-scala-dev/dev_guide/local-development-workflow/index.html) and [the OLP CLI documentation](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data-workflows.html). -1. Use the [`olp local catalog create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data/catalog-commands.html#catalog-create) +1. Use + the [`olp local catalog create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data/catalog-commands.html#catalog-create) command to create a local catalog. ```bash @@ -99,7 +104,8 @@ olp local catalog create infer-stop-signs infer-stop-signs --summary "Output cat The local catalog will have the HRN `hrn:local:data:::infer-stop-signs`. -2. Use the [`olp local catalog layer add`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data/layer-commands.html#catalog-layer-add) +2. Use + the [`olp local catalog layer add`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/local-data/layer-commands.html#catalog-layer-add) command to add one `versioned` layer to your catalog: ```bash @@ -125,15 +131,6 @@ sbt run \ -Dspark.master=local[2] ``` -For the HERE platform environment for China: - -``` -sbt run \ - -Dpipeline-config.file=config/here-china/local-pipeline-config.conf \ - -Dpipeline-job.file=config/here-china/pipeline-job.conf \ - -Dspark.master=local[2] -``` - In the command above: - `local-pipeline-config.conf` defines the `HRN`s of the input and output catalogs. @@ -151,46 +148,57 @@ You should see the following result with stop signs visualized: ![Local Data Inspector](images/stop-signs_output_layer.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 manually inspect them. - ### Run this Application as a HERE Platform Pipeline #### Configure a Project -To follow this example, you will need a [project](https://developer.here.com/documentation/identity-access-management/dev_guide/topics/manage-projects.html). A project is a collection of platform resources +To follow this example, you will need +a [project](https://developer.here.com/documentation/identity-access-management/dev_guide/topics/manage-projects.html). +A project is a collection of platform resources (catalogs, pipelines, and schemas) with controlled access. You can create a project through the -[HERE platform portal](https://platform.here.com/) / [HERE platform portal in China](https://platform.hereolp.cn/). +[HERE platform portal](https://platform.here.com/). -Alternatively, use the OLP CLI [`olp project create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html#create-project) command to create the project: +Alternatively, use the OLP +CLI [`olp project create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html#create-project) +command to create the project: ```bash olp project create $PROJECT_ID $PROJECT_NAME ``` -The command returns the [HERE Resource Name (HRN)](https://developer.here.com/documentation/data-user-guide/user_guide/index.html) of your new project. Note down this HRN as you will need it later in this tutorial. +The command returns +the [HERE Resource Name (HRN)](https://developer.here.com/documentation/data-user-guide/user_guide/index.html) of your +new project. Note down this HRN as you will need it later in this tutorial. > #### Note > > You do not have to provide a `--scope` parameter if your app has a default scope. > For details on how to set a default project scope for an app, see the _Specify a -> default Project_ for Apps chapter of the [Identity & Access Management Developer Guide](https://developer.here.com/documentation/identity-access-management/dev_guide/index.html). +> default Project_ for Apps chapter of +> the [Identity & Access Management Developer Guide](https://developer.here.com/documentation/identity-access-management/dev_guide/index.html). -For more information on how to work with projects, see the [Organize your work in projects](https://developer.here.com/documentation/java-scala-dev/dev_guide/organize-work-in-projects/index.html) tutorial. +For more information on how to work with projects, see +the [Organize your work in projects](https://developer.here.com/documentation/java-scala-dev/dev_guide/organize-work-in-projects/index.html) +tutorial. #### Create an Output Catalog The catalog you need to create is used to store the results of the `Infer Stop Signs From Sensors` example. -Use the [HERE platform portal](https://platform.here.com/) / [HERE platform portal in China](https://platform.hereolp.cn/) to [create the output catalog](https://developer.here.com/documentation/data-user-guide/user_guide/portal/catalog-creating.html) in your project and [add the following layers](https://developer.here.com/documentation/data-user-guide/user_guide/portal/layer-creating.html): +Use the [HERE platform portal](https://platform.here.com/) +to [create the output catalog](https://developer.here.com/documentation/data-user-guide/user_guide/portal/catalog-creating.html) +in your project +and [add the following layers](https://developer.here.com/documentation/data-user-guide/user_guide/portal/layer-creating.html): | Layer ID | Layer Type | Content Type | Partitioning | Zoom Level | Content Encoding | Coverage | | ---------- | ---------- | ------------------------ | ------------ | ---------- | ---------------- | -------- | -| stop-signs | versioned | application/vnd.geo+json | heretile | 14 | uncompressed | DE or CN | +| stop-signs | versioned | application/vnd.geo+json | heretile | 14 | uncompressed | DE | Alternatively, you can use the OLP CLI to create the catalog and the corresponding layers. -1. Use the [`olp catalog create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/catalog-commands.html#catalog-create) command to create the catalog. +1. Use + the [`olp catalog create`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/catalog-commands.html#catalog-create) + command to create the catalog. Make sure to note down the HRN returned by the following command for later use: ```bash @@ -199,7 +207,9 @@ olp catalog create $CATALOG_ID $CATALOG_ID --summary "Output catalog for Infer S --scope $PROJECT_HRN ``` -2. Use the [`olp catalog layer add`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/layer-commands.html#catalog-layer-add) command to add two versioned layers to your catalog: +2. Use + the [`olp catalog layer add`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/layer-commands.html#catalog-layer-add) + command to add two versioned layers to your catalog: ```bash olp catalog layer add $CATALOG_HRN stop-signs stop-signs --versioned --summary "Layer for output partitions" \ @@ -214,26 +224,33 @@ olp catalog layer add $CATALOG_HRN stop-signs stop-signs --versioned --summary " 3. Update the output catalog HRN in the pipeline-config.conf file -The `config/here/pipeline-config.conf` (for the HERE platform environment) and -`config/here-china/pipeline-config.conf` (for the HERE platform environment in China) files contain +The `config/here/pipeline-config.conf` (for the HERE platform environment) file contains the permanent configuration of the data sources for the example. Pick the file that corresponds to your platform environment and replace `YOUR_OUTPUT_CATALOG_HRN` placeholder with the HRN of your Stream Path Matcher 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 +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. -4. Use the [`olp project resource link`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-link-commands.html#project-resource-link) command to link the _HERE Sample SDII Messages - Berlin_ and _HERE Optimized Map for Location Library_ catalog to your project. +4. Use + the [`olp project resource link`](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-link-commands.html#project-resource-link) + command to link the _HERE Sample SDII Messages - Berlin_ and _HERE Optimized Map for Location Library_ catalog to + your project. ```bash olp project resource link $PROJECT_HRN $INPUT_SDII_CATALOG olp project resource link $PROJECT_HRN $INPUT_OPTIMIZED_MAP_CATALOG ``` -- For more details on catalog commands, see [Catalog Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/catalog-commands.html). -- For more details on layer commands, see [Layer Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/layer-commands.html). -- For more details on project commands, see [Project Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html). -- For instructions on how to link a resource to a project, see [Project Resource Link command](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-link-commands.html#project-resource-link). +- For more details on catalog commands, + see [Catalog Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/catalog-commands.html). +- For more details on layer commands, + see [Layer Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/data/layer-commands.html). +- For more details on project commands, + see [Project Commands](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-commands.html). +- For instructions on how to link a resource to a project, + see [Project Resource Link command](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/project/project-link-commands.html#project-resource-link). #### Generate a Fat JAR file @@ -247,7 +264,8 @@ sbt assembly You can use the OLP CLI to create pipeline components and activate the pipeline version with the following commands: -1. [Create](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/pipeline-workflows.html) pipeline components: +1. [Create](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/pipeline-workflows.html) + pipeline components: ```bash olp pipeline create $COMPONENT_NAME_Pipeline --scope $PROJECT_HRN @@ -274,7 +292,8 @@ If the operation is successful, you should be able to see the log level you just olp pipeline version log level get $PIPELINE_ID $PIPELINE_VERSION_ID --scope $PROJECT_HRN ``` -2. [Activate](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/pipeline/version-commands.html#pipeline-version-activate) the pipeline version: +2. [Activate](https://developer.here.com/documentation/open-location-platform-cli/user_guide/topics/pipeline/version-commands.html#pipeline-version-activate) + the pipeline version: ```bash olp pipeline version activate $PIPELINE_ID $PIPELINE_VERSION_ID --input-catalogs "$PATH_TO_CONFIG_FOLDER/pipeline-job.conf" --scope $PROJECT_HRN diff --git a/location/scala/spark/infer-stop-signs-from-sensors/build.sbt b/location/scala/spark/infer-stop-signs-from-sensors/build.sbt index d0bb9e2bd..56f25e64e 100644 --- a/location/scala/spark/infer-stop-signs-from-sensors/build.sbt +++ b/location/scala/spark/infer-stop-signs-from-sensors/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.example.location" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn @@ -25,7 +25,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/local-pipeline-config.conf b/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/local-pipeline-config.conf deleted file mode 100644 index 73ab18dcb..000000000 --- a/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/local-pipeline-config.conf +++ /dev/null @@ -1,16 +0,0 @@ -// This configuration file is meant to facilitate the local development -// Please refer to the HERE Data SDK documentation for more information -// -// This file is not supposed to be included in the pipeline JAR. -// For local development, it may be passed to the pipeline using: -// -Dpipeline-config.file=config/here-china/pipeline-config.conf - -pipeline.config { - - input-catalogs { - sdii-catalog { hrn = "hrn:here-cn:data::olp-cn-here:sample-data" } - optimized-map-catalog { hrn = "hrn:here-cn:data::olp-cn-here:here-optimized-map-for-location-library-china-2" } - } - - output-catalog { hrn = "hrn:local:data:::infer-stop-signs" } -} diff --git a/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/pipeline-config.conf b/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/pipeline-config.conf deleted file mode 100644 index 35ca7b36f..000000000 --- a/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/pipeline-config.conf +++ /dev/null @@ -1,16 +0,0 @@ -// This configuration file is meant to facilitate the local development -// Please refer to the HERE Data SDK documentation for more information -// -// This file is not supposed to be included in the pipeline JAR. -// For local development, it may be passed to the pipeline using: -// -Dpipeline-config.file=config/here-china/pipeline-config.conf - -pipeline.config { - - input-catalogs { - sdii-catalog { hrn = "hrn:here-cn:data::olp-cn-here:sample-data" } - optimized-map-catalog { hrn = "hrn:here-cn:data::olp-cn-here:here-optimized-map-for-location-library-china-2" } - } - - output-catalog { hrn = "YOUR_OUTPUT_CATALOG_HRN" } -} diff --git a/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/pipeline-job.conf b/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/pipeline-job.conf deleted file mode 100644 index 07e9a4f80..000000000 --- a/location/scala/spark/infer-stop-signs-from-sensors/config/here-china/pipeline-job.conf +++ /dev/null @@ -1,9 +0,0 @@ -pipeline.job.catalog-versions { - - input-catalogs { - optimized-map-catalog { - processing-type = "reprocess" - version = 2 - } - } -} diff --git a/location/scala/spark/infer-stop-signs-from-sensors/project/Dependencies.scala b/location/scala/spark/infer-stop-signs-from-sensors/project/Dependencies.scala index 81e7882a7..909cc7cd8 100644 --- a/location/scala/spark/infer-stop-signs-from-sensors/project/Dependencies.scala +++ b/location/scala/spark/infer-stop-signs-from-sensors/project/Dependencies.scala @@ -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. diff --git a/location/scala/spark/infer-stop-signs-from-sensors/project/plugins.sbt b/location/scala/spark/infer-stop-signs-from-sensors/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/location/scala/spark/infer-stop-signs-from-sensors/project/plugins.sbt +++ b/location/scala/spark/infer-stop-signs-from-sensors/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/location/scala/spark/infer-stop-signs-from-sensors/src/main/scala/com/here/platform/example/location/scala/spark/InferStopSignsFromSensorsExample.scala b/location/scala/spark/infer-stop-signs-from-sensors/src/main/scala/com/here/platform/example/location/scala/spark/InferStopSignsFromSensorsExample.scala index 538893b88..3f0fbb1f1 100644 --- a/location/scala/spark/infer-stop-signs-from-sensors/src/main/scala/com/here/platform/example/location/scala/spark/InferStopSignsFromSensorsExample.scala +++ b/location/scala/spark/infer-stop-signs-from-sensors/src/main/scala/com/here/platform/example/location/scala/spark/InferStopSignsFromSensorsExample.scala @@ -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. diff --git a/location/scala/standalone/build.sbt b/location/scala/standalone/build.sbt index d806a6319..ec840e1f8 100644 --- a/location/scala/standalone/build.sbt +++ b/location/scala/standalone/build.sbt @@ -1,7 +1,7 @@ import com.here.bom.Bom ThisBuild / organization := "com.here.platform.example.location" -ThisBuild / version := "0.0.861" +ThisBuild / version := "0.0.865" ThisBuild / scalaVersion := "2.12.18" ThisBuild / evictionErrorLevel := sbt.util.Level.Warn @@ -25,7 +25,7 @@ val organizationSettings: Seq[Setting[_]] = Seq( ) ) -val sdkBomVersion = "2.58.2" +val sdkBomVersion = "2.59.2" assembly / assemblyJarName := f"${name.value}-${version.value}-platform.jar" assembly / assemblyMergeStrategy := { diff --git a/location/scala/standalone/project/Dependencies.scala b/location/scala/standalone/project/Dependencies.scala index 78c6bc785..66136e5d2 100644 --- a/location/scala/standalone/project/Dependencies.scala +++ b/location/scala/standalone/project/Dependencies.scala @@ -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. diff --git a/location/scala/standalone/project/plugins.sbt b/location/scala/standalone/project/plugins.sbt index f7eca05e5..4b8b157cc 100644 --- a/location/scala/standalone/project/plugins.sbt +++ b/location/scala/standalone/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += Resolver.url("MAVEN_CENTRAL", url("https://repo.maven.apache.org/maven2"))( Patterns("[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")) -addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.3") +addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.5") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31") diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/AdasCurvatureAttributeExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/AdasCurvatureAttributeExample.scala index e64e55605..9fa33dccf 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/AdasCurvatureAttributeExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/AdasCurvatureAttributeExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/ConvertTpeg2ContainerExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/ConvertTpeg2ContainerExample.scala index 496870144..92f241026 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/ConvertTpeg2ContainerExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/ConvertTpeg2ContainerExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/ExtractSpecificTpeg2MessagesExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/ExtractSpecificTpeg2MessagesExample.scala index 9556d6d4e..d5843a6bd 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/ExtractSpecificTpeg2MessagesExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/ExtractSpecificTpeg2MessagesExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/FunctionalClassExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/FunctionalClassExample.scala index e300aed1a..e3d304518 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/FunctionalClassExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/FunctionalClassExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/GraphExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/GraphExample.scala index 75ab76739..dc7009248 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/GraphExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/GraphExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/HereMapContentToOptimizedMapTranslationExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/HereMapContentToOptimizedMapTranslationExample.scala index 690102e34..376881f17 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/HereMapContentToOptimizedMapTranslationExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/HereMapContentToOptimizedMapTranslationExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/MostProbablePathExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/MostProbablePathExample.scala index 208a4d53f..1eaeda350 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/MostProbablePathExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/MostProbablePathExample.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2023 HERE Europe B.V. + * Copyright (C) 2017-2024 HERE Europe B.V. * * The following rights to redistribution and use the software example in * source and binary forms, with or without modification, are granted to diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OlrCreateReferenceFromHmcSegmentsExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OlrCreateReferenceFromHmcSegmentsExample.scala index e5dfb6405..2568e5147 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OlrCreateReferenceFromHmcSegmentsExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OlrCreateReferenceFromHmcSegmentsExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OlrResolveReferenceToHmcSegmentsExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OlrResolveReferenceToHmcSegmentsExample.scala index 4ad009716..4410b519f 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OlrResolveReferenceToHmcSegmentsExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OlrResolveReferenceToHmcSegmentsExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OnTheFlyCompiledPropertyMapExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OnTheFlyCompiledPropertyMapExample.scala index 2f3a11a27..dc133160d 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OnTheFlyCompiledPropertyMapExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/OnTheFlyCompiledPropertyMapExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PathMatcherExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PathMatcherExample.scala index 3919f298e..31472ecb2 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PathMatcherExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PathMatcherExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PathMatcherWithCustomNetworkFilterExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PathMatcherWithCustomNetworkFilterExample.scala index 5539eb48e..0886433af 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PathMatcherWithCustomNetworkFilterExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PathMatcherWithCustomNetworkFilterExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PointMatcherExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PointMatcherExample.scala index 4df0d5ac5..3ee8dadb3 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PointMatcherExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/PointMatcherExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/SparsePathMatcherExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/SparsePathMatcherExample.scala index 2ae7c7d91..730123d30 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/SparsePathMatcherExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/SparsePathMatcherExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TmcCreateAndResolveExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TmcCreateAndResolveExample.scala index b28046953..c70a7cb50 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TmcCreateAndResolveExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TmcCreateAndResolveExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TmcResolveReferencesInRttiMessageExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TmcResolveReferencesInRttiMessageExample.scala index 52620fd3a..ef6a5b285 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TmcResolveReferencesInRttiMessageExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TmcResolveReferencesInRttiMessageExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TurnRestrictionsExample.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TurnRestrictionsExample.scala index d80988952..c616f6d02 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TurnRestrictionsExample.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/TurnRestrictionsExample.scala @@ -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. diff --git a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/utils/FileNameHelper.scala b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/utils/FileNameHelper.scala index 96ba1d04b..7a026c710 100644 --- a/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/utils/FileNameHelper.scala +++ b/location/scala/standalone/src/main/scala/com/here/platform/example/location/scala/standalone/utils/FileNameHelper.scala @@ -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.