Build osmium_convert in order to be able to eventually replace osmosis

.travis.yml

@@ -117,12 +117,8 @@ install:
       mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
       export PATH=${DEPS_DIR}/cmake/bin:${PATH}
 
-      OSMOSIS_URL="http://bretth.dev.openstreetmap.org/osmosis-build/osmosis-latest.tgz"
-      mkdir osmosis && travis_retry wget --quiet -O - ${OSMOSIS_URL} | tar -xz -C osmosis
-      export PATH=${DEPS_DIR}/osmosis/bin:${PATH}
-
     elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      brew install cmake boost libzip libstxxl libxml2 lua51 luabind tbb GDAL osmosis
+      brew install cmake boost libzip libstxxl libxml2 lua51 luabind tbb GDAL
     fi
 
 before_script:

docker/Dockerfile

@@ -12,8 +12,6 @@ RUN pip install awscli
 
 # luabind
 RUN curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash
-# osmosis
-RUN curl -s https://gist.githubusercontent.com/DennisOSRM/803a64a9178ec375069f/raw/ | sudo bash
 
 RUN useradd -ms /bin/bash mapbox
 USER mapbox

features/support/data.rb

@@ -229,17 +229,6 @@ def write_osm
   end
 end
 
-def convert_osm_to_pbf
-  unless File.exist?("#{osm_file}.osm.pbf")
-    log_preprocess_info
-    log "== Converting #{osm_file}.osm to protobuffer format...", :preprocess
-    unless system "osmosis --read-xml #{osm_file}.osm --write-pbf #{osm_file}.osm.pbf omitmetadata=true >>#{PREPROCESS_LOG_FILE} 2>&1"
-      raise OsmosisError.new $?, "osmosis exited with code #{$?.exitstatus}"
-    end
-    log '', :preprocess
-  end
-end
-
 def extracted?
   Dir.chdir TEST_FOLDER do
     File.exist?("#{extracted_file}.osrm") &&
@@ -258,23 +247,18 @@ def write_timestamp
   File.open( "#{prepared_file}.osrm.timestamp", 'w') {|f| f.write(OSM_TIMESTAMP) }
 end
 
-def pbf?
-  input_format=='pbf'
-end
-
 def write_input_data
   Dir.chdir TEST_FOLDER do
     write_osm
     write_timestamp
-    convert_osm_to_pbf if pbf?
   end
 end
 
 def extract_data
   Dir.chdir TEST_FOLDER do
     log_preprocess_info
     log "== Extracting #{osm_file}.osm...", :preprocess
-    unless system "#{BIN_PATH}/osrm-extract #{osm_file}.osm#{'.pbf' if pbf?} #{@extract_args} --profile #{PROFILES_PATH}/#{@profile}.lua >>#{PREPROCESS_LOG_FILE} 2>&1"
+    unless system "#{BIN_PATH}/osrm-extract #{osm_file}.osm #{@extract_args} --profile #{PROFILES_PATH}/#{@profile}.lua >>#{PREPROCESS_LOG_FILE} 2>&1"
       log "*** Exited with code #{$?.exitstatus}.", :preprocess
       raise ExtractError.new $?.exitstatus, "osrm-extract exited with code #{$?.exitstatus}."
     end

features/support/exceptions.rb

@@ -37,12 +37,6 @@ def initialize code, msg
   end
 end
 
-class OsmosisError < OSRMError
-  def initialize code, msg
-    super 'osmosis', code, msg, PREPROCESS_LOG_FILE, 40
-  end
-end
-
 class ExtractError < OSRMError
   def initialize code, msg
     super 'osrm-extract', code, msg, PREPROCESS_LOG_FILE, 3