Skip to content

Commit

Permalink
Merge pull request #30 from julianrojas87/pilot2
Browse files Browse the repository at this point in the history
v2.0.0
  • Loading branch information
julianrojas87 authored Jun 15, 2021
2 parents e3424dc + bb43f46 commit 1ccfd59
Show file tree
Hide file tree
Showing 45 changed files with 2,744 additions and 1,034,894 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@

All notable changes to this project will be documented in this file.

## [v2.0.0](https://github.com/julianrojas87/era-data-mappings/compare/v1.2.1...v2.0.0) (2021-04-12)

### Raw Data: [ERA-KG-v2.0.0](https://cloud.ilabt.imec.be/index.php/s/PogwXPSr8yEkKmo)

### Features and Bug Fixes

* Full mapping refactoring to adopt a topological model in following the [RailTopoModel](http://www.railtopomodel.org/en/download/irs30100-apr16-7594BCA1524E14224D0.html?file=files/download/RailTopoModel/180416_uic_irs30100.pdf)
* Parallel mapping process based on GNU parallel
* Mappings for micro and meso elements from RailML sources (moved to independent branch [railml-mappings](https://github.com/julianrojas87/era-data-mappings/tree/railml-mappings))
* Mappings for RailML signals (moved to independent branch [railml-mappings](https://github.com/julianrojas87/era-data-mappings/tree/railml-mappings))
* Mappings for micro and meso elements from RINF source
* Aggregation of micro and meso elements
* Mappings for `era:SectionOfLine` entities
* Mappings to link RINF OPs to RailML meso NetElements (moved to independent branch [railml-mappings](https://github.com/julianrojas87/era-data-mappings/tree/railml-mappings))
* Mappings to link RINF SoLs to RailML meso NetElements (moved to independent branch [railml-mappings](https://github.com/julianrojas87/era-data-mappings/tree/railml-mappings))
* Adjust internal connectivity table for creating proper URIs
* Removed ECVVR, RSRD and RailML sources and mappings (moved to independent branch [railml-mappings](https://github.com/julianrojas87/era-data-mappings/tree/railml-mappings))
* Bump RML mapper to v4.10.0
* Produce N-Quads formatted RDF by default
* Allow to configure the named graph IRI via environment variable

## [v1.2.1](https://github.com/julianrojas87/era-data-mappings/compare/v1.2.0...v1.2.1) (2021-03-03)

### Raw Data: [ERA-KG-v1.2.1](https://drive.google.com/file/d/1KofPzYx2ovgAz85rLuO5J98SEs2BjWbO/view?usp=sharing)
Expand Down
20 changes: 16 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Start from a Node.js ready container
FROM node:latest
# Start from a Debian
FROM debian:latest

# Install Node.js v14
RUN apt-get update; apt-get install -y curl \
&& curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& apt-get install -y nodejs \
&& curl -L https://www.npmjs.com/install.sh | sh

# Install OpenJDK-11
RUN apt-get update \
Expand All @@ -8,6 +14,7 @@ RUN apt-get update \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*

ENV LC_ALL en_US.UTF-8
ENV JAVA_VERSION jdk-11.0.10+9

RUN set -eux; \
Expand Down Expand Up @@ -48,14 +55,19 @@ RUN set -eux; \
ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH"

# Install git
RUN apt-get update && apt-get install -y git

# Install GNU parallel (http://www.gnu.org/software/parallel/)
RUN apt-get update \
&& apt-get -y install parallel

# Create a new directory for app files
RUN mkdir -p /opt/era-data-mappings
# Set working directory in the container
WORKDIR /opt/era-data-mappings
# Copy source files
COPY . /opt/era-data-mappings/
# Copy YARRRML mappings
COPY mappings /opt/era-data-mappings
# Set output volume path
VOLUME [ "/opt/era-data-mappings/knowledge-graph" ]
# Install envsub to parse environment variables at runtime
Expand Down
3 changes: 2 additions & 1 deletion conf.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
KG_VERSION=1.2.1
KG_VERSION=2.0.0-alpha
NAMED_GRAPH=http://era.europa.eu/knowledge-graph
RINF_HOST=//10.10.160.21:1433
RINF_USER=SA
RINF_PWD=ChooChoo2020
Expand Down
Loading

0 comments on commit 1ccfd59

Please sign in to comment.