wip: wm_clip

IV/layer2img.py

@@ -18,14 +18,21 @@ PSQL_CREDS = "host=127.0.0.1 dbname=osm user=osm password=osm"
 TEXTWIDTH_CM = 12.12364
 TEXTWIDTH_INCH = TEXTWIDTH_CM * 10 / INCH_MM
 
-def plt_size(string):
+SCALES = {
+    "GDR10": 10000,
+    "GDR50": 50000,
+    "GDR250": 250000,
+}
+
+
+def wm_clip(string):
     if not string:
         return None
-    try:
+    gdr, name = string.split(":")
-        w, h = string.split("x")
+    if scale := SCALES.get(gdr):
-        return float(w) / INCH_MM, float(h) / INCH_MM
+        return gdr, scale
-    except Exception as e:
+    scales = ",".join(SCALES.keys())
-        raise argparse.ArgumentTypeError from e
+    raise argparse.ArgumentTypeError("invalid scale. Expected %s" % scales)
 
 
 def parse_args():
@@ -43,25 +50,29 @@ def parse_args():
     parser.add_argument('--group3-cmap', type=bool)
     parser.add_argument('--group3-linestyle')
 
+    parser.add_argument('--wmclip',
+                        type=wm_clip, help="Clip. E.g. GDR10:nemunas-merkys")
     parser.add_argument('--widthdiv',
                         default=1, type=float, help='Width divisor')
 
     parser.add_argument('-o', '--outfile', metavar='<file>')
-    parser.add_argument('--clip', type=float, nargs=4, metavar=BOUNDS)
-    parser.add_argument(
-            '--size',
-            type=plt_size,
-            help='Figure size in mm (WWxHH)',
-    )
     return parser.parse_args()
 
 
-def read_layer(select):
+def read_layer(select, width, maybe_wmclip):
     if not select:
         return
+    way = "way"
+    if maybe_wmclip:
+        name, scale = maybe_wmclip
+        way = "wm_clip(way, {name}, {scale}, {width})".format(
+                name=name,
+                scale=scale,
+                width=width,
+        )
     conn = psycopg2.connect(PSQL_CREDS)
-    sql = "SELECT way FROM %s" % select
+    sql = "SELECT {way} as way1 FROM {select}".format(way=way, select=select)
-    return geopandas.read_postgis(sql, con=conn, geom_col='way')
+    return geopandas.read_postgis(sql, con=conn, geom_col='way1')
 
 
 def plot_args(color, maybe_cmap, maybe_linestyle):
@@ -78,23 +89,17 @@ def plot_args(color, maybe_cmap, maybe_linestyle):
 
 def main():
     args = parse_args()
-    group1 = read_layer(args.group1_select)
+    width = TEXTWIDTH_INCH / args.widthdiv
-    group2 = read_layer(args.group2_select)
+    group1 = read_layer(args.group1_select, width, args.wmclip)
-    group3 = read_layer(args.group3_select)
+    group2 = read_layer(args.group2_select, width, args.wmclip)
+    group3 = read_layer(args.group3_select, width, args.wmclip)
     c1 = plot_args(BLACK, args.group1_cmap, args.group1_linestyle)
     c2 = plot_args(ORANGE, args.group2_cmap, args.group2_linestyle)
     c3 = plot_args(GREEN, args.group3_cmap, args.group3_linestyle)
 
     rc('text', usetex=True)
     fig, ax = plt.subplots()
-    if args.size:
+    fig.set_figwidth(width)
-        fig.set_size_inches(args.size)
-    else:
-        w = TEXTWIDTH_INCH / args.widthdiv
-        fig.set_figwidth(TEXTWIDTH_INCH / args.widthdiv)
-    if c := args.clip:
-        ax.set_xlim(left=c[0], right=c[2])
-        ax.set_ylim(bottom=c[1], top=c[3])
 
     group1 is not None and group1.plot(ax=ax, **c1)
     group2 is not None and group2.plot(ax=ax, **c2)

IV/tests-rivers.sql

@@ -14,6 +14,38 @@ insert into wm_visuals(name, way) values('nemunas-merkys',
   )
 );
 
+
+-- wm_envelope clips a geometry by a bounding box around a given object,
+-- matching dimensions of A-class paper (1 by sqrt(2).
+drop function if exists wm_clip;
+create function wm_clip(
+  geom geometry,
+  center text,
+  projection_scale integer,
+  projection_width float
+) returns geometry as $$
+declare
+  gcenter geometry;
+  bbox geometry;
+  halfX float;
+  halfY float;
+begin
+  halfX = projection_scale * projection_width / 2;
+  halfY = halfX * sqrt(2);
+  select way from wm_visuals where name=center into gcenter;
+  if gcenter is null then
+    raise 'center % not found', center;
+  end if;
+
+  bbox = st_envelope(
+    st_project(gcenter, halfX, radians(90)),
+    st_project(gcenter, halfY, 0)
+  );
+
+  return st_intersection(bbox, geom);
+end
+$$ language plpgsql;
+
 do $$
 declare
   npoints bigint;