rgeo-proj4 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b578b226ebc3b376a92f58cf080d34f237b5929751e6b856e493d9b6a6daa1ae
-  data.tar.gz: 84f4953ac2aea3783e7a807542c7aaf102b265dc454a9de97c340d70f04685c1
+  metadata.gz: 62f388f5389751fb4be6fd44e37b436c2a3465dc407346cb8c311c839af0e35f
+  data.tar.gz: 259d631dcf07572b4a99de70cef87156ea880bc2db54aeaea9cf6db4530772ed
 SHA512:
-  metadata.gz: bb2bddfdc101da5c0a4b2af5d5445ce7e57f8d49505b5bb2f53376e81b5ed392d4d2183c11e6cc1e0d86fc5b2fc83cc1afe1d6a3c72fcf8924d779fbd04fdffb
-  data.tar.gz: 3f21328f3beff54191cf496f784a432185f9999d4b71ddeab91d772627f26bbc97deb1882cab9d9f997d16432993d2c742c3d2638005d2f372959428201f4e05
+  metadata.gz: c48f8cb2676bbc08309a6c103b7df1c7f121e586b300357bc278bccc3dcdfb72f597b9e89bf11603a749a329910685ee93adf719ab4f47db7b3676a9290911ac
+  data.tar.gz: 623d1af171edc6e69bc1d8967d9b9262f2a96dd560fcaa6cc5982be75d1e4d4177957255fd28895230c4645cc1ed778a0f77354d3b0b30d031cda8d9bc984687

data/ext/proj4_c_impl/errors.c

@@ -0,0 +1,33 @@
+#ifndef RGEO_PROJ4_ERRORS_INCLUDED
+#define RGEO_PROJ4_ERRORS_INCLUDED
+
+#include <ruby.h>
+
+#include "preface.h"
+
+#ifdef RGEO_PROJ4_SUPPORTED
+
+#include "errors.h"
+
+RGEO_BEGIN_C
+
+VALUE error_module;
+VALUE rb_eRGeoError;
+VALUE rb_eRGeoInvalidProjectionError;
+
+void rgeo_init_proj_errors() {
+  VALUE rgeo_module;
+
+  rgeo_module = rb_define_module("RGeo");
+  error_module = rb_define_module_under(rgeo_module, "Error");
+  rb_eRGeoError =
+      rb_define_class_under(error_module, "RGeoError", rb_eRuntimeError);
+  rb_eRGeoInvalidProjectionError =
+      rb_define_class_under(error_module, "InvalidProjection", rb_eRGeoError);
+}
+
+RGEO_END_C
+
+#endif // RGEO_PROJ4_SUPPORTED
+
+#endif // RGEO_GEOS_ERROS_INCLUDED

data/ext/proj4_c_impl/errors.h

@@ -0,0 +1,22 @@
+#ifndef RGEO_PROJ4_ERRORS_INCLUDED
+#define RGEO_PROJ4_ERRORS_INCLUDED
+
+#include <ruby.h>
+
+#ifdef RGEO_PROJ4_SUPPORTED
+
+RGEO_BEGIN_C
+
+extern VALUE error_module;
+// Main rgeo error type
+extern VALUE rb_eRGeoError;
+// RGeo::Error::InvalidProjection
+extern VALUE rb_eRGeoInvalidProjectionError;
+
+void rgeo_init_proj_errors();
+
+RGEO_END_C
+
+#endif // RGEO_PROJ4_SUPPORTED
+
+#endif // RGEO_PROJ4_ERRORS_INCLUDED

data/ext/proj4_c_impl/extconf.rb

@@ -12,7 +12,18 @@ else
 
   require "mkmf"
 
-  header_dirs_ =
+  if ENV.key?("DEBUG") || ENV.key?("MAINTAINER_MODE")
+    $CFLAGS << " -DDEBUG" \
+               " -Wall" \
+               " -ggdb" \
+               " -pedantic" \
+               " -std=c17"
+
+    extra_flags = ENV.fetch("MAINTAINER_MODE", ENV.fetch("DEBUG", ""))
+    $CFLAGS << " " << extra_flags if extra_flags.strip.start_with?("-")
+  end
+
+  header_dirs =
     [
       ::RbConfig::CONFIG["includedir"],
       "/usr/local/include",
@@ -26,7 +37,7 @@ else
       "/Library/Frameworks/PROJ.framework/unix/include",
       "/usr/include"
     ]
-  lib_dirs_ =
+  lib_dirs =
     [
       ::RbConfig::CONFIG["libdir"],
       "/usr/local/lib",
@@ -42,28 +53,65 @@ else
       "/usr/lib",
       "/usr/lib64"
     ]
-  header_dirs_.delete_if { |path_| !::File.directory?(path_) }
-  lib_dirs_.delete_if { |path_| !::File.directory?(path_) }
+  header_dirs.delete_if { |path| !::File.directory?(path) }
+  lib_dirs.delete_if { |path| !::File.directory?(path) }
 
-  found_proj_ = false
-  header_dirs_, lib_dirs_ = dir_config("proj", header_dirs_, lib_dirs_)
+  found_proj = false
+  found_valid_proj_version = false
+  header_dirs, lib_dirs = dir_config("proj", header_dirs, lib_dirs)
   if have_header("proj.h")
     $libs << " -lproj"
+    found_proj = true
 
-    if have_func("proj_create", "proj.h")
-      found_proj_ = true
-      have_func("proj_create_crs_to_crs_from_pj", "proj.h")
-      have_func("proj_normalize_for_visualization", "proj.h")
-    else
-      $libs.gsub!(" -lproj", "")
+    required_proj_funcs = %w[
+      proj_create
+      proj_create_crs_to_crs_from_pj
+      proj_normalize_for_visualization
+    ]
+    found_valid_proj_version = required_proj_funcs.all? do |func|
+      have_func(func, "proj.h")
     end
   end
   have_func("rb_gc_mark_movable")
 
-  unless found_proj_
-    puts "**** WARNING: Unable to find Proj headers or Proj version is too old."
-    puts "**** Compiling without Proj support."
+  unless found_proj
+
+    install_text = case RUBY_PLATFORM
+                   when /linux/
+                     %(
+  Please install proj like so:
+    apt-get install libproj-dev proj-bin
+                     )
+                   when /darwin/
+                     %(
+  Please install proj like so:
+    brew install proj
+                     )
+                   else
+                     %(
+  Please install proj.
+                     )
+                   end
+    error_msg = %(
+**** WARNING: Unable to find Proj headers. Ensure that Proj is properly installed.
+
+#{install_text}
+
+or set the path manually using:
+ --with-proj-dir or with the --with-proj-include and --with-proj-lib options
+    )
+    warn error_msg
+    raise
   end
-  create_makefile("rgeo/coord_sys/proj4_c_impl")
 
+  unless found_valid_proj_version
+    error_msg = %(
+**** WARNING: The found Proj version is not new enough to be used for this version of rgeo-proj4.
+**** Proj 6.2+ is required.
+    )
+    warn error_msg
+    raise
+  end
+
+  create_makefile("rgeo/coord_sys/proj4_c_impl")
 end