Replaced raw PGSQL testing file with Osmosis-driven XML file

diff --git a/Dockerfile b/Dockerfile
index 8fcfa40e32d4165c994baa892597791277d2a7ca..e50699ab9de3b2d3a6dc1cdb1994102a40195f30 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && \
       libxslt1-dev \
       locales \
       nodejs \
       libxslt1-dev \
       locales \
       nodejs \

-      osmosis \
+      default-jre-headless \

       phantomjs \
       postgresql-client \
       ruby-dev \
       phantomjs \
       postgresql-client \
       ruby-dev \


@@ -27,6 +27,10 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

+# Install current Osmosis
+RUN curl -OL https://github.com/openstreetmap/osmosis/releases/download/0.47.2/osmosis-0.47.2.tgz && \
+    tar -C /usr/local -xzf osmosis-0.47.2.tgz
+

 # Setup app location
 RUN mkdir -p /app
 WORKDIR /app
 # Setup app location
 RUN mkdir -p /app
 WORKDIR /app

diff --git a/docker/null-island.osm.pgsql b/docker/null-island.osm.pgsql
deleted file mode 100644 (file)
index 7883aa0..0000000
--- a/docker/null-island.osm.pgsql
+++ /dev/null
@@ -1,93 +0,0 @@
---\r
--- PostgreSQL database dump\r
---\r
-\r
--- Dumped from database version 11.7 (Debian 11.7-1.pgdg90+1)\r
--- Dumped by pg_dump version 11.7 (Debian 11.7-0+deb10u1)\r
-\r
-SET statement_timeout = 0;\r
-SET lock_timeout = 0;\r
-SET idle_in_transaction_session_timeout = 0;\r
-SET client_encoding = 'UTF8';\r
-SET standard_conforming_strings = on;\r
-SELECT pg_catalog.set_config('search_path', '', false);\r
-SET check_function_bodies = false;\r
-SET xmloption = content;\r
-SET client_min_messages = warning;\r
-SET row_security = off;\r
-\r
---\r
--- Data for Name: users; Type: TABLE DATA; Schema: public; Owner: -\r
---\r
-\r
-INSERT INTO public.users (email, id, pass_crypt, creation_time, display_name, data_public, description, home_lat, home_lon, home_zoom, nearby, pass_salt, email_valid, new_email, creation_ip, languages, status, terms_agreed, consider_pd, auth_uid, preferred_editor, terms_seen, description_format, changesets_count, traces_count, diary_entries_count, image_use_gravatar, auth_provider, home_tile, tou_agreed) VALUES ('osmosis_user_1@example.com', 1, '00000000000000000000000000000000', '2020-02-19 05:38:19.423372', 'nobody', true, 'nobody', 0, 0, 3, 50, '00000000', false, NULL, NULL, NULL, 'pending', NULL, false, NULL, NULL, false, 'markdown', 0, 0, 0, false, NULL, NULL, NULL);\r
-\r
-\r
---\r
--- Data for Name: changesets; Type: TABLE DATA; Schema: public; Owner: -\r
---\r
-\r
-INSERT INTO public.changesets (id, user_id, created_at, min_lat, max_lat, min_lon, max_lon, closed_at, num_changes) VALUES (0, 1, '2020-02-19 05:38:19.423372', -900000000, 900000000, -1800000000, 1800000000, '2020-02-19 05:38:19.423372', 0);\r
-\r
-\r
---\r
--- Data for Name: changeset_tags; Type: TABLE DATA; Schema: public; Owner: -\r
---\r
-\r
-INSERT INTO public.changeset_tags (changeset_id, k, v) VALUES (0, 'created_by', 'Osmosis 0.47');\r
-INSERT INTO public.changeset_tags (changeset_id, k, v) VALUES (0, 'replication', 'true');\r
-\r
-\r
---\r
--- Data for Name: current_nodes; Type: TABLE DATA; Schema: public; Owner: -\r
---\r
-\r
-INSERT INTO public.current_nodes (id, latitude, longitude, changeset_id, visible, "timestamp", tile, version) VALUES (1, 0, 0, 0, true, '1970-01-01 00:00:00', 3221225472, 1);\r
-\r
-\r
---\r
--- Data for Name: current_node_tags; Type: TABLE DATA; Schema: public; Owner: -\r
---\r
-\r
-INSERT INTO public.current_node_tags (node_id, k, v) VALUES (1, 'name', 'Null Island');\r
-\r
-\r
---\r
--- Data for Name: nodes; Type: TABLE DATA; Schema: public; Owner: -\r
---\r
-\r
-INSERT INTO public.nodes (node_id, latitude, longitude, changeset_id, visible, "timestamp", tile, version, redaction_id) VALUES (1, 0, 0, 0, true, '1970-01-01 00:00:00', 3221225472, 1, NULL);\r
-\r
-\r
---\r
--- Data for Name: node_tags; Type: TABLE DATA; Schema: public; Owner: -\r
---\r
-\r
-INSERT INTO public.node_tags (node_id, version, k, v) VALUES (1, 1, 'name', 'Null Island');\r
-\r
-\r
---\r
--- Name: changesets_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -\r
---\r
-\r
-SELECT pg_catalog.setval('public.changesets_id_seq', 1, false);\r
-\r
-\r
---\r
--- Name: current_nodes_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -\r
---\r
-\r
-SELECT pg_catalog.setval('public.current_nodes_id_seq', 1, false);\r
-\r
-\r
---\r
--- Name: users_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -\r
---\r
-\r
-SELECT pg_catalog.setval('public.users_id_seq', 1, false);\r
-\r
-\r
---\r
--- PostgreSQL database dump complete\r
---\r
-\r

diff --git a/docker/null-island.osm.xml b/docker/null-island.osm.xml
new file mode 100644 (file)
index 0000000..96edeab
--- /dev/null
+++ b/docker/null-island.osm.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version="0.6" generator="Osmosis 0.47.2">
+  <bounds minlon="-180.00000" minlat="-90.00000" maxlon="180.00000" maxlat="90.00000" origin="Osmosis 0.47.2"/>
+  <node id="1" version="1" timestamp="1970-01-01T00:00:00Z" uid="1" user="nobody" lat="0" lon="0">
+    <tag k="name" v="Null Island"/>
+  </node>
+</osm>