9.4.0 release

Author: bosborn

.gitignore

@@ -114,7 +114,6 @@ m4/lt~obsolete.m4
 /src/geodtest*
 /src/gie
 /src/proj
-/src/proj_config.h
 /src/proj_config.h.in
 /src/projinfo
 /src/projsync

PROJ-include.podspec

@@ -0,0 +1,22 @@
+Pod::Spec.new do |s|
+  s.name    = "PROJ-include"
+  s.version = "9.4.0"
+  s.summary = "PROJ coordinate transformation software library."
+  s.description = <<-DESC
+PROJ is a generic coordinate transformation software that transforms geospatial coordinates from one coordinate reference system (CRS) to another. This includes cartographic projections as well as geodetic transformations. PROJ is released under the X/MIT open source license
+
+PROJ includes command line applications for easy conversion of coordinates from text files or directly from user input. In addition to the command line utilities PROJ also exposes an application programming interface, or API in short. The API lets developers use the functionality of PROJ in their own software without having to implement similar functionality themselves.
+
+PROJ started purely as a cartography application letting users convert geodetic coordinates into projected coordinates using a number of different cartographic projections. Over the years, as the need has become apparent, support for datum shifts has slowly worked its way into PROJ as well. Today PROJ supports more than a hundred different map projections and can transform coordinates between datums using all but the most obscure geodetic techniques.
+  DESC
+  s.homepage = "https://proj.org/"
+  s.license = { :type => "MIT",
+                :file => "COPYING" }
+  s.author  = 'PROJ contributors', 'Open Source Geospatial Foundation'
+  s.source  = { :git => "https://github.com/ngageoint/PROJ.git", :tag => s.version.to_s }
+
+  s.platforms = { :ios => "12.0", :osx => "10.13", :watchos => "4.0", :tvos => "12.0" }
+
+  s.source_files = 'include/**/*.hpp'
+
+end

PROJ.podspec

@@ -0,0 +1,27 @@
+Pod::Spec.new do |s|
+  s.name    = "PROJ"
+  s.version = "9.4.0"
+  s.summary = "PROJ coordinate transformation software library."
+  s.description = <<-DESC
+PROJ is a generic coordinate transformation software that transforms geospatial coordinates from one coordinate reference system (CRS) to another. This includes cartographic projections as well as geodetic transformations. PROJ is released under the X/MIT open source license
+
+PROJ includes command line applications for easy conversion of coordinates from text files or directly from user input. In addition to the command line utilities PROJ also exposes an application programming interface, or API in short. The API lets developers use the functionality of PROJ in their own software without having to implement similar functionality themselves.
+
+PROJ started purely as a cartography application letting users convert geodetic coordinates into projected coordinates using a number of different cartographic projections. Over the years, as the need has become apparent, support for datum shifts has slowly worked its way into PROJ as well. Today PROJ supports more than a hundred different map projections and can transform coordinates between datums using all but the most obscure geodetic techniques.
+  DESC
+  s.homepage = "https://proj.org/"
+  s.license = { :type => "MIT",
+                :file => "COPYING" }
+  s.author  = 'PROJ contributors', 'Open Source Geospatial Foundation'
+  s.source  = { :git => "https://github.com/ngageoint/PROJ.git", :tag => s.version.to_s }
+
+  s.platforms = { :ios => "12.0", :osx => "10.13", :watchos => "4.0", :tvos => "12.0" }
+
+  s.source_files = 'src/**/*.{c,h,cpp,hpp}'
+  s.exclude_files = 'src/tests/*'
+
+  s.resource_bundle = { 'PROJ' => ['proj.db'] }
+
+  s.dependency 'PROJ-include', '~> 9.4.0'
+
+end

include/proj/internal/coordinatesystem_internal.hpp

@@ -33,7 +33,7 @@
 #ifndef COORDINATESYSTEM_INTERNAL_HH_INCLUDED
 #define COORDINATESYSTEM_INTERNAL_HH_INCLUDED
 
-#include "proj/util.hpp"
+#include "util.hpp"
 
 #include <map>
 #include <set>

include/proj/internal/include_nlohmann_json.hpp

@@ -35,15 +35,15 @@
 
 #ifdef EXTERNAL_NLOHMANN_JSON
 
-#include <nlohmann/json.hpp>
+#include <json.hpp>
 
 #else // !EXTERNAL_NLOHMANN_JSON
 
 // to avoid any clash if PROJ users have another version of nlohmann/json.hpp
 #define nlohmann proj_nlohmann
 
 #if !defined(DOXYGEN_ENABLED)
-#include "vendor/nlohmann/json.hpp"
+#include "json.hpp"
 #endif
 
 #endif // EXTERNAL_NLOHMANN_JSON

include/proj/internal/internal.hpp

@@ -46,7 +46,7 @@
 #endif
 #include <vector>
 
-#include "proj/util.hpp"
+#include "util.hpp"
 
 //! @cond Doxygen_Suppress
 

include/proj/internal/io_internal.hpp

@@ -36,8 +36,8 @@
 #include <string>
 #include <vector>
 
-#include "proj/io.hpp"
-#include "proj/util.hpp"
+#include "io.hpp"
+#include "util.hpp"
 
 //! @cond Doxygen_Suppress
 

include/proj/internal/tracing.hpp

@@ -33,7 +33,7 @@
 
 #include <string>
 
-#include "proj/util.hpp"
+#include "util.hpp"
 
 #ifdef ENABLE_TRACING
 

proj.db

@@ -51,10 +51,10 @@
 #include <cmath> /* for isnan */
 #include <math.h>
 
-#include "proj/common.hpp"
-#include "proj/coordinateoperation.hpp"
-#include "proj/internal/internal.hpp"
-#include "proj/internal/io_internal.hpp"
+#include "common.hpp"
+#include "coordinateoperation.hpp"
+#include "internal.hpp"
+#include "io_internal.hpp"
 
 using namespace NS_PROJ::internal;