update projection system

riatelab · Dec 4, 2024 · d96e6fb · d96e6fb
1 parent 6ca10b4
commit d96e6fb
Show file tree

Hide file tree

Showing 82 changed files with 338 additions and 168 deletions.
diff --git a/docs/container_create.js.html b/docs/container_create.js.html
diff --git a/docs/container_draw.js.html b/docs/container_draw.js.html
diff --git a/docs/container_render.js.html b/docs/container_render.js.html
diff --git a/docs/data/search.json b/docs/data/search.json
diff --git a/docs/effect_blur.js.html b/docs/effect_blur.js.html
diff --git a/docs/effect_clippath.js.html b/docs/effect_clippath.js.html
diff --git a/docs/effect_radialgradient.js.html b/docs/effect_radialgradient.js.html
diff --git a/docs/effect_shadow.js.html b/docs/effect_shadow.js.html
diff --git a/docs/global.html b/docs/global.html
diff --git a/docs/grid_arbitrary.js.html b/docs/grid_arbitrary.js.html
diff --git a/docs/grid_count.js.html b/docs/grid_count.js.html
diff --git a/docs/grid_diamond.js.html b/docs/grid_diamond.js.html
diff --git a/docs/grid_dot.js.html b/docs/grid_dot.js.html
diff --git a/docs/grid_h3.js.html b/docs/grid_h3.js.html
diff --git a/docs/grid_hexbin.js.html b/docs/grid_hexbin.js.html
diff --git a/docs/grid_intersect.js.html b/docs/grid_intersect.js.html
diff --git a/docs/grid_make.js.html b/docs/grid_make.js.html
diff --git a/docs/grid_square.js.html b/docs/grid_square.js.html
diff --git a/docs/grid_triangle.js.html b/docs/grid_triangle.js.html
diff --git a/docs/helpers_tooltip.js.html b/docs/helpers_tooltip.js.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/legend_box.js.html b/docs/legend_box.js.html
diff --git a/docs/legend_choro-horizontal.js.html b/docs/legend_choro-horizontal.js.html
diff --git a/docs/legend_choro-vertical.js.html b/docs/legend_choro-vertical.js.html
diff --git a/docs/legend_circles-half.js.html b/docs/legend_circles-half.js.html
diff --git a/docs/legend_circles-nested.js.html b/docs/legend_circles-nested.js.html
diff --git a/docs/legend_circles.js.html b/docs/legend_circles.js.html
diff --git a/docs/legend_mushrooms.js.html b/docs/legend_mushrooms.js.html
diff --git a/docs/legend_spikes.js.html b/docs/legend_spikes.js.html
diff --git a/docs/legend_squares-nested.js.html b/docs/legend_squares-nested.js.html
diff --git a/docs/legend_squares.js.html b/docs/legend_squares.js.html
diff --git a/docs/legend_symbol-horizontal.js.html b/docs/legend_symbol-horizontal.js.html
diff --git a/docs/legend_symbol-vertical.js.html b/docs/legend_symbol-vertical.js.html
diff --git a/docs/legend_typo-horizontal.js.html b/docs/legend_typo-horizontal.js.html
diff --git a/docs/legend_typo-vertical.js.html b/docs/legend_typo-vertical.js.html
diff --git a/docs/mark_circle.js.html b/docs/mark_circle.js.html
diff --git a/docs/mark_footer.js.html b/docs/mark_footer.js.html
diff --git a/docs/mark_graticule.js.html b/docs/mark_graticule.js.html
diff --git a/docs/mark_halfcircle.js.html b/docs/mark_halfcircle.js.html
diff --git a/docs/mark_header.js.html b/docs/mark_header.js.html
diff --git a/docs/mark_north.js.html b/docs/mark_north.js.html
diff --git a/docs/mark_outline.js.html b/docs/mark_outline.js.html
diff --git a/docs/mark_path.js.html b/docs/mark_path.js.html
diff --git a/docs/mark_scalebar.js.html b/docs/mark_scalebar.js.html
diff --git a/docs/mark_spike.js.html b/docs/mark_spike.js.html
diff --git a/docs/mark_square.js.html b/docs/mark_square.js.html
diff --git a/docs/mark_symbol.js.html b/docs/mark_symbol.js.html
diff --git a/docs/mark_text.js.html b/docs/mark_text.js.html
diff --git a/docs/mark_tile.js.html b/docs/mark_tile.js.html
diff --git a/docs/plot_plot.js.html b/docs/plot_plot.js.html
diff --git a/docs/plot_plot_choro.js.html b/docs/plot_plot_choro.js.html
diff --git a/docs/plot_plot_prop.js.html b/docs/plot_plot_prop.js.html
diff --git a/docs/plot_plot_propchoro.js.html b/docs/plot_plot_propchoro.js.html
diff --git a/docs/plot_plot_proptypo.js.html b/docs/plot_plot_proptypo.js.html
diff --git a/docs/plot_plot_symbol.js.html b/docs/plot_plot_symbol.js.html
diff --git a/docs/plot_plot_typo.js.html b/docs/plot_plot_typo.js.html
diff --git a/docs/tool_addfonts.js.html b/docs/tool_addfonts.js.html
diff --git a/docs/tool_centroid.js.html b/docs/tool_centroid.js.html
diff --git a/docs/tool_choro.js.html b/docs/tool_choro.js.html
diff --git a/docs/tool_dissolve.js.html b/docs/tool_dissolve.js.html
diff --git a/docs/tool_dodge.js.html b/docs/tool_dodge.js.html
diff --git a/docs/tool_dotstogrid.js.html b/docs/tool_dotstogrid.js.html
diff --git a/docs/tool_featurecollection.js.html b/docs/tool_featurecollection.js.html
diff --git a/docs/tool_geotable.js.html b/docs/tool_geotable.js.html
diff --git a/docs/tool_height.js.html b/docs/tool_height.js.html
diff --git a/docs/tool_merge.js.html b/docs/tool_merge.js.html
diff --git a/docs/tool_proj4d3.js.html b/docs/tool_proj4d3.js.html
diff --git a/docs/tool_project.js.html b/docs/tool_project.js.html
diff --git a/docs/tool_radius.js.html b/docs/tool_radius.js.html
diff --git a/docs/tool_random.js.html b/docs/tool_random.js.html
diff --git a/docs/tool_replicate.js.html b/docs/tool_replicate.js.html
diff --git a/docs/tool_rewind.js.html b/docs/tool_rewind.js.html
diff --git a/docs/tool_ridge.js.html b/docs/tool_ridge.js.html
diff --git a/docs/tool_symbols.js.html b/docs/tool_symbols.js.html
diff --git a/docs/tool_typo.js.html b/docs/tool_typo.js.html
diff --git a/docs/tool_unproject.js.html b/docs/tool_unproject.js.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "d3-force": "^3.0.0",
     "d3-format": "^3.1.0",
     "d3-geo": "^3.1.0",
+    "d3-geo-polygon": "^2.0.1",
     "d3-geo-projection": "^4.0.0",
     "d3-geo-scale-bar": "^1.2.5",
     "d3-interpolate": "^3.0.1",

diff --git a/src/container/create.js b/src/container/create.js
@@ -1,5 +1,6 @@
 import { extent } from "../helpers/extent";
 import { unique } from "../helpers/utils";
+import { getproj } from "../projection/getproj";
 import { create as create2 } from "d3-selection";
 import {
   geoPath,
@@ -61,7 +62,7 @@ import { plot as addplot } from "../plot/plot.js";
  * @property {number} [id = "map"] - id of the svg container.
  * @property {number} [height] - height of the container. This value is automatically calculated according to `domain`. But it can be forced by entering a value.
  * @property {object|object[]} [domain] - the domain corresponds to the geographical area to be displayed. It is defined by a geoJSON or an array containing geoJSONs.
- * @property {function|string} [projection] - d3 function of projection. See [d3-geo](https://github.com/d3/d3-geo) & [d3-geo-projection](https://github.com/d3/d3-geo-projection). You can aslo write "mercator" to use tiles. (default: "none")
+ * @property {function|string} [projection] - d3 function of projection. See [d3-geo](https://github.com/d3/d3-geo), [d3-geo-projection](https://github.com/d3/d3-geo-projection) & [d3-geo-polygon](https://github.com/d3/d3-geo-polygon). All theses functions are available in geoviz like this: viz.proj.geoSomething(). You can alse use a String. E.g: d3.geoMercator() <=> viz.proj.geoMercator() <=> "Mercator" <=> "mercator". Null or “none” allows you to display geometries as they are, without reprojecting them. In this case, you must specify the domain.
  * @property {number[]} [pos] - position of the container (if contained in another svg container)
  * @property {string} [background] - background color
  * @property {string} [fontFamily] - font-family for the entire map
@@ -93,6 +94,9 @@ export function create({
   warning_message = [],
 } = {}) {
   // projection
+
+  projection = getproj(projection);
+
   const initproj = projection;
   switch (projection) {
     case "mercator":

diff --git a/src/index.js b/src/index.js
@@ -139,3 +139,9 @@ export { symbol } from "./mark/symbol.js";
 
 // Plot
 export { plot } from "./plot/plot.js";
+
+// Proj
+import * as d3geo from "d3-geo";
+import * as d3geoprojection from "d3-geo-projection";
+import * as d3geoppolygon from "d3-geo-polygon";
+export let proj = Object.assign({}, d3geo, d3geoprojection, d3geoppolygon);
diff --git a/src/projection/getproj.js b/src/projection/getproj.js
@@ -1,24 +1,27 @@
-import { geoEquirectangular } from "d3-geo";
-const d3 = Object.assign({}, { geoEquirectangular });
+import { stringtod3proj } from "./stringtod3proj";
+import { Polar } from "./polar";
+import { HoaXiaoguang } from "./hoaxiaoguang";
+import { Spilhaus } from "./spilhaus";
 
 export function getproj(projection) {
   /* DEFAULT - the projection is not defined.
-    The default projection is d3.geoEquirectangular().
    */
 
-  if (projection === null || projection === undefined || projection === "") {
-    return d3.geoEquirectangular();
-  }
-
-  /* FUNCTION - if the projection is a d3.js function (outside bertin.js).
+  if (
+    projection === null ||
+    projection === undefined ||
+    projection === "" ||
+    projection === "none"
+  ) {
+    return "none";
+  } else if (typeof projection === "function") {
+    /* FUNCTION - if the projection is a d3.js.
     then, the function is used directly.*/
-
-  if (typeof projection === "function") {
     return projection;
   }
 
   //   STRINGS
-  if (typeof projection === "string") {
+  else if (typeof projection === "string" && projection !== "none") {
     projection = projection.replace(/\s/g, "");
 
     /* CUSTOM projections*/

diff --git a/src/projection/stringtod3proj.js b/src/projection/stringtod3proj.js
@@ -1,6 +1,7 @@
 import * as d3geo from "d3-geo";
 import * as d3geoprojection from "d3-geo-projection";
-const d3 = Object.assign({}, d3geo, d3geoprojection);
+import * as d3geoppolygon from "d3-geo-polygon";
+const d3 = Object.assign({}, d3geo, d3geoprojection, d3geoppolygon);
 
 export function stringtod3proj(string) {
   let str = string;
@@ -12,7 +13,7 @@ export function stringtod3proj(string) {
     } else {
       str = str.replace(".", "().");
     }
-    str = "d3.geo" + str;
+    str = "d3.geo" + str.charAt(0).toUpperCase() + str.slice(1);
   }
 
   const createProjection = new Function("d3", `return (${str})`);