[Mapbender-commits] r7836 - in branches/2.7: http/print resources/db resources/db/pgsql/UTF-8/update

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Fri May 27 09:56:15 EDT 2011


Author: astrid_emde
Date: 2011-05-27 06:56:15 -0700 (Fri, 27 May 2011)
New Revision: 7836

Added:
   branches/2.7/http/print/A3_landscape_official_template.json
   branches/2.7/http/print/A3_landscape_official_template.odg
   branches/2.7/http/print/A3_landscape_official_template.pdf
   branches/2.7/http/print/A3_portrait_official_template.json
   branches/2.7/http/print/A3_portrait_official_template.odg
   branches/2.7/http/print/A3_portrait_official_template.pdf
   branches/2.7/http/print/A3_portrait_template_pure_map.json
   branches/2.7/http/print/A3_portrait_template_pure_map.odg
   branches/2.7/http/print/A3_portrait_template_pure_map.pdf
   branches/2.7/http/print/A4_landscape_official_template.json
   branches/2.7/http/print/A4_landscape_official_template.odg
   branches/2.7/http/print/A4_landscape_official_template.pdf
   branches/2.7/http/print/A4_landscape_template_pure_map.json
   branches/2.7/http/print/A4_landscape_template_pure_map.odg
   branches/2.7/http/print/A4_landscape_template_pure_map.pdf
   branches/2.7/http/print/A4_portrait_official_template.json
   branches/2.7/http/print/A4_portrait_official_template.odg
   branches/2.7/http/print/A4_portrait_official_template.pdf
   branches/2.7/http/print/A4_portrait_template_pure_map.json
   branches/2.7/http/print/A4_portrait_template_pure_map.odg
   branches/2.7/http/print/A4_portrait_template_pure_map.pdf
   branches/2.7/resources/db/pgsql/UTF-8/update/update_2.7.1_to_2.7.2_pgsql_UTF-8.sql
Modified:
   branches/2.7/resources/db/install.bat
   branches/2.7/resources/db/install.sh
   branches/2.7/resources/db/update.bat
   branches/2.7/resources/db/update.sh
Log:
new print templates, fixes from #835,new sql file for updates from 2.7.1 to 2.7.2

Added: branches/2.7/http/print/A3_landscape_official_template.json
===================================================================
--- branches/2.7/http/print/A3_landscape_official_template.json	                        (rev 0)
+++ branches/2.7/http/print/A3_landscape_official_template.json	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,170 @@
+{
+    "type" : "templatePDF",
+    "orientation" : "L",
+    "units" : "mm",
+    "format" : "a3",
+    "controls" : [
+    	{
+    		"id" : "title",
+    		"label" : "Titel",
+    		"type" : "text",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"titel" : "value"
+    		}
+    	},
+    	{
+    		"id" : "dpi",
+    		"label" : "DPI",
+    		"type" : "select",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"karte" : "res_dpi"
+    		},
+    		"options" : [
+    			{
+    			"value" : "288",
+    			"label" : "hoch (288 dpi)"
+    			},{
+    			"value" : "72",
+    			"label" : "normal (72 dpi)"
+    			}
+    		]
+    	},
+    	{
+    		"id" : "comment1",
+    		"label" : "Kommentar 1 (30 Zeichen)",
+    		"type" : "textarea",
+    		"size" : 5,
+    		"pageElementsLink" : {
+    			"kommentar1" : "value"
+    		}
+    	},
+    	{
+    		"id" : "comment2",
+    		"label" : "Kommentar 2 (30 Zeichen)",
+    		"type" : "textarea",
+    		"size" : 5,
+    		"pageElementsLink" : {
+    			"kommentar2" : "value"
+    		}
+    	},
+    	{
+    		"id" : "angle",
+    		"label" : "Winkel",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"nordpfeil" : "angle",
+    			"karte" : "angle",
+    			"minikarte" : "angle"
+    		}
+    	},
+    	{
+    		"id" : "coordinates",
+    		"type" : "hidden"
+    	},
+    	{
+    		"id" : "scale",
+    		"label" : "Maßstab",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"scale" : "value"
+    		}
+    	}
+    ],
+    "pages" : [
+    	{
+    	 "tpl" : "../print/A3_landscape_official_template.pdf",
+    	 "useTplPage" : 1,
+    	 "elements" : {
+	    	 "karte" : {
+    			"type" : "map",
+    			"res_dpi" : 72,
+    			"x_ul" : 25.2,
+	    		"y_ul" : 10.2,
+	    		"width" : 384.5,
+    			"height" : 256.5,
+    			"coords" : 1,
+    			"coords_font_family" : "Arial",
+    			"coords_font_size" : 7
+	   			},
+	   		"messung" : {
+    			"type" : "measure",
+    			"do_fill" : 0,
+    			"fill_color" : {
+    				"r" : 255,
+    				"g" : 0,
+    				"b" : 0
+    				},
+    			"do_stroke" : 0,
+    			"stroke_color" : {
+    				"r" : 0,
+    				"g" : 0,
+    				"b" : 0
+    				},
+    			"line_style" : {
+    				"width" : 1.0
+    				}
+	   			},
+	   		"titel" : {
+    			"type" : "text",
+    			"x_ul" : 142,
+	    		"y_ul" : 277.8,
+	    		"font_family" : "Arial",
+	    		"font_size" : 14
+	   			},
+	   		"scale" : {
+    			"type" : "text",
+    			"x_ul" : 331.6,
+	    		"y_ul" : 280,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+				"value" : "scale"
+	   		},
+	   		"date" : {
+    			"type" : "text",
+    			"x_ul" : 331.6,
+	    		"y_ul" : 290,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+				"value" : "date"
+	   		},
+	   		"nordpfeil" : {
+    			"type" : "image",
+    			"x_ul" : 30,
+	    		"y_ul" : 282,
+	    		"width" : 6,
+	    		"height" : 12,
+	    		"angle" : 0,
+				"filename" : "../print/img/northarrow_simple.png"
+	   		},
+	   		"kommentar1" : {
+    			"type" : "para",
+    			"x_ul" : 108.5,
+	    		"y_ul" : 279.6,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+	    		"width" : 30,
+	    		"height" : 5,
+	    		"align" : "L",
+	    		"border" : 0,
+	    		"fill" : 1,
+	    		"border_width" : 0.5
+	   			},
+	   		"kommentar2" : {
+    			"type" : "para",
+    			"x_ul" : 108.5,
+	    		"y_ul" : 284.8,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+	    		"width" : 30,
+	    		"height" : 5,
+	    		"align" : "L",
+	    		"border" : 0,
+	    		"fill" : 1,
+	    		"border_width" : 0.5
+	   			}
+	   		}
+	   	}
+	]
+}

Added: branches/2.7/http/print/A3_landscape_official_template.odg
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A3_landscape_official_template.odg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A3_landscape_official_template.pdf
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A3_landscape_official_template.pdf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A3_portrait_official_template.json
===================================================================
--- branches/2.7/http/print/A3_portrait_official_template.json	                        (rev 0)
+++ branches/2.7/http/print/A3_portrait_official_template.json	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,170 @@
+{
+    "type" : "templatePDF",
+    "orientation" : "P",
+    "units" : "mm",
+    "format" : "a3",
+    "controls" : [
+    	{
+    		"id" : "title",
+    		"label" : "Titel",
+    		"type" : "text",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"titel" : "value"
+    		}
+    	},
+    	{
+    		"id" : "dpi",
+    		"label" : "DPI",
+    		"type" : "select",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"karte" : "res_dpi"
+    		},
+    		"options" : [
+    			{
+    			"value" : "288",
+    			"label" : "hoch (288 dpi)"
+    			},{
+    			"value" : "72",
+    			"label" : "normal (72 dpi)"
+    			}
+    		]
+    	},
+    	{
+    		"id" : "comment1",
+    		"label" : "Kommentar 1 (30 Zeichen)",
+    		"type" : "textarea",
+    		"size" : 5,
+    		"pageElementsLink" : {
+    			"kommentar1" : "value"
+    		}
+    	},
+    	{
+    		"id" : "comment2",
+    		"label" : "Kommentar 2 (30 Zeichen)",
+    		"type" : "textarea",
+    		"size" : 5,
+    		"pageElementsLink" : {
+    			"kommentar2" : "value"
+    		}
+    	},
+    	{
+    		"id" : "angle",
+    		"label" : "Winkel",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"nordpfeil" : "angle",
+    			"karte" : "angle",
+    			"minikarte" : "angle"
+    		}
+    	},
+    	{
+    		"id" : "coordinates",
+    		"type" : "hidden"
+    	},
+    	{
+    		"id" : "scale",
+    		"label" : "Maßstab",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"scale" : "value"
+    		}
+    	}
+    ],
+    "pages" : [
+    	{
+    	 "tpl" : "../print/A3_portrait_official_template.pdf",
+    	 "useTplPage" : 1,
+    	 "elements" : {
+	    	 "karte" : {
+    			"type" : "map",
+    			"res_dpi" : 72,
+    			"x_ul" : 25.2,
+	    		"y_ul" : 10.2,
+	    		"width" : 261.5,
+    			"height" : 379.5,
+    			"coords" : 1,
+    			"coords_font_family" : "Arial",
+    			"coords_font_size" : 7
+	   			},
+			"messung" : {
+				"type" : "measure",
+				"do_fill" : 0,
+				"fill_color" : {
+					"r" : 255,
+					"g" : 0,
+					"b" : 0
+					},
+				"do_stroke" : 0,
+				"stroke_color" : {
+					"r" : 0,
+					"g" : 0,
+					"b" : 0
+					},
+				"line_style" : {
+					"width" : 1.0
+				}
+			},
+	   		"titel" : {
+    			"type" : "text",
+    			"x_ul" : 143.7,
+	    		"y_ul" : 401,
+	    		"font_family" : "Arial",
+	    		"font_size" : 14
+	   			},
+	   		"scale" : {
+    			"type" : "text",
+    			"x_ul" : 210.5,
+	    		"y_ul" : 403.2,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+				"value" : "scale"
+	   		},
+	   		"date" : {
+    			"type" : "text",
+    			"x_ul" : 210.5,
+	    		"y_ul" : 413.2,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+				"value" : "date"
+	   		},
+	   		"nordpfeil" : {
+    			"type" : "image",
+    			"x_ul" : 29.8,
+	    		"y_ul" : 405,
+	    		"width" : 6,
+	    		"height" : 12,
+	    		"angle" : 0,
+				"filename" : "../print/img/northarrow_simple.png"
+	   		},
+	   		"kommentar1" : {
+    			"type" : "para",
+    			"x_ul" : 108.6,
+	    		"y_ul" : 403.6,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+	    		"width" : 45,
+	    		"height" : 4,
+	    		"align" : "L",
+	    		"border" : 0,
+	    		"fill" : 1,
+	    		"border_width" : 0.1
+	   			},
+	   		"kommentar2" : {
+    			"type" : "para",
+    			"x_ul" : 108.6,
+	    		"y_ul" : 409.1,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+	    		"width" : 45,
+	    		"height" : 4,
+	    		"align" : "L",
+	    		"border" : 0,
+	    		"fill" : 1,
+	    		"border_width" : 0.1
+	   			}
+	   		}
+	   	}
+	]
+}

Added: branches/2.7/http/print/A3_portrait_official_template.odg
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A3_portrait_official_template.odg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A3_portrait_official_template.pdf
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A3_portrait_official_template.pdf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A3_portrait_template_pure_map.json
===================================================================
--- branches/2.7/http/print/A3_portrait_template_pure_map.json	                        (rev 0)
+++ branches/2.7/http/print/A3_portrait_template_pure_map.json	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,85 @@
+{
+    "type" : "templatePDF",
+    "orientation" : "P",
+    "units" : "mm",
+    "format" : "a3",
+    "controls" : [
+    	{
+    		"id" : "dpi",
+    		"label" : "DPI",
+    		"type" : "select",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"karte" : "res_dpi"
+    		},
+    		"options" : [
+    			{
+    			"value" : "288",
+    			"label" : "hoch (288 dpi)"
+    			},{
+    			"value" : "72",
+    			"label" : "normal (72 dpi)"
+    			}
+    		]
+    	},
+        {
+            "id" : "angle",
+            "label" : "Winkel",
+            "type" : "text",
+            "pageElementsLink" : {
+                "nordpfeil" : "angle",
+                "karte" : "angle",
+                "minikarte" : "angle"
+            }
+        },
+        {
+            "id" : "coordinates",
+            "type" : "hidden"
+        },
+		{
+    		"id" : "scale",
+    		"label" : "Maßstab",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"scale" : "value"
+    		}
+    	}
+    ],
+    "pages" : [
+        {
+            "tpl" : "../print/A3_portrait_template_pure_map.pdf",
+            "useTplPage" : 1,
+            "elements" : {
+                "karte" : {
+                    "type" : "map",
+                    "res_dpi" : 72,
+                    "x_ul" : 5.2,
+                    "y_ul" : 5.2,
+                    "width" : 286.6,
+                    "height" : 409.5,
+                    "coords" : 0,
+                    "coords_font_family" : "Arial",
+                    "coords_font_size" : 8
+                },
+				"messung" : {
+					"type" : "measure",
+					"do_fill" : 0,
+					"fill_color" : {
+						"r" : 255,
+						"g" : 0,
+						"b" : 0
+						},
+					"do_stroke" : 0,
+					"stroke_color" : {
+						"r" : 0,
+						"g" : 0,
+						"b" : 0
+						},
+					"line_style" : {
+						"width" : 1.0
+    				}
+	   			}
+			}
+		}
+    ]
+}

Added: branches/2.7/http/print/A3_portrait_template_pure_map.odg
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A3_portrait_template_pure_map.odg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A3_portrait_template_pure_map.pdf
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A3_portrait_template_pure_map.pdf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A4_landscape_official_template.json
===================================================================
--- branches/2.7/http/print/A4_landscape_official_template.json	                        (rev 0)
+++ branches/2.7/http/print/A4_landscape_official_template.json	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,170 @@
+{
+    "type" : "templatePDF",
+    "orientation" : "L",
+    "units" : "mm",
+    "format" : "a4",
+    "controls" : [
+    	{
+    		"id" : "title",
+    		"label" : "Titel",
+    		"type" : "text",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"titel" : "value"
+    		}
+    	},
+    	{
+    		"id" : "dpi",
+    		"label" : "DPI",
+    		"type" : "select",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"karte" : "res_dpi"
+    		},
+    		"options" : [
+    			{
+    			"value" : "288",
+    			"label" : "hoch (288 dpi)"
+    			},{
+    			"value" : "72",
+    			"label" : "normal (72 dpi)"
+    			}
+    		]
+    	},
+    	{
+    		"id" : "comment1",
+    		"label" : "Kommentar 1 (30 Zeichen)",
+    		"type" : "textarea",
+    		"size" : 5,
+    		"pageElementsLink" : {
+    			"kommentar1" : "value"
+    		}
+    	},
+    	{
+    		"id" : "comment2",
+    		"label" : "Kommentar 2 (30 Zeichen)",
+    		"type" : "textarea",
+    		"size" : 5,
+    		"pageElementsLink" : {
+    			"kommentar2" : "value"
+    		}
+    	},
+    	{
+    		"id" : "angle",
+    		"label" : "Winkel",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"nordpfeil" : "angle",
+    			"karte" : "angle",
+    			"minikarte" : "angle"
+    		}
+    	},
+    	{
+    		"id" : "coordinates",
+    		"type" : "hidden"
+    	},
+    	{
+    		"id" : "scale",
+    		"label" : "Maßstab",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"scale" : "value"
+    		}
+    	}
+    ],
+    "pages" : [
+    	{
+    	 "tpl" : "../print/A4_landscape_official_template.pdf",
+    	 "useTplPage" : 1,
+    	 "elements" : {
+	    	 "karte" : {
+    			"type" : "map",
+    			"res_dpi" : 72,
+    			"x_ul" : 10.2,
+	    		"y_ul" : 25.2,
+	    		"width" : 276.5,
+    			"height" : 154.6,
+    			"coords" : 1,
+    			"coords_font_family" : "Arial",
+    			"coords_font_size" : 7
+	   			},
+	   		"messung" : {
+    			"type" : "measure",
+    			"do_fill" : 0,
+    			"fill_color" : {
+    				"r" : 255,
+    				"g" : 0,
+    				"b" : 0
+    				},
+    			"do_stroke" : 0,
+    			"stroke_color" : {
+    				"r" : 0,
+    				"g" : 0,
+    				"b" : 0
+    				},
+    			"line_style" : {
+    				"width" : 1.0
+    				}
+	   			},
+	   		"titel" : {
+    			"type" : "text",
+    			"x_ul" : 127.5,
+	    		"y_ul" : 190.8,
+	    		"font_family" : "Arial",
+	    		"font_size" : 14
+	   			},
+	   		"scale" : {
+    			"type" : "text",
+    			"x_ul" : 208.3,
+	    		"y_ul" : 193,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+				"value" : "scale"
+	   		},
+	   		"date" : {
+    			"type" : "text",
+    			"x_ul" : 208.3,
+	    		"y_ul" : 203,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+				"value" : "date"
+	   		},
+	   		"nordpfeil" : {
+    			"type" : "image",
+    			"x_ul" : 15,
+	    		"y_ul" : 195,
+	    		"width" : 6,
+	    		"height" : 12,
+	    		"angle" : 0,
+				"filename" : "../print/img/northarrow_simple.png"
+	   		},
+	   		"kommentar1" : {
+    			"type" : "para",
+    			"x_ul" : 93.5,
+	    		"y_ul" : 192.7,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+	    		"width" : 30,
+	    		"height" : 5,
+	    		"align" : "L",
+	    		"border" : 0,
+	    		"fill" : 1,
+	    		"border_width" : 0.5
+	   			},
+	   		"kommentar2" : {
+    			"type" : "para",
+    			"x_ul" : 93.5,
+	    		"y_ul" : 198.1,
+	    		"font_family" : "Arial",
+	    		"font_size" : 12,
+	    		"width" : 30,
+	    		"height" : 5,
+	    		"align" : "L",
+	    		"border" : 0,
+	    		"fill" : 1,
+	    		"border_width" : 0.5
+	   			}
+	   		}
+	   	}
+	]
+}

Added: branches/2.7/http/print/A4_landscape_official_template.odg
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A4_landscape_official_template.odg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A4_landscape_official_template.pdf
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A4_landscape_official_template.pdf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A4_landscape_template_pure_map.json
===================================================================
--- branches/2.7/http/print/A4_landscape_template_pure_map.json	                        (rev 0)
+++ branches/2.7/http/print/A4_landscape_template_pure_map.json	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,85 @@
+{
+    "type" : "templatePDF",
+    "orientation" : "L",
+    "units" : "mm",
+    "format" : "a4",
+    "controls" : [
+    	{
+    		"id" : "dpi",
+    		"label" : "DPI",
+    		"type" : "select",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"karte" : "res_dpi"
+    		},
+    		"options" : [
+    			{
+    			"value" : "288",
+    			"label" : "hoch (288 dpi)"
+    			},{
+    			"value" : "72",
+    			"label" : "normal (72 dpi)"
+    			}
+    		]
+    	},
+        {
+            "id" : "angle",
+            "label" : "Winkel",
+            "type" : "text",
+            "pageElementsLink" : {
+                "nordpfeil" : "angle",
+                "karte" : "angle",
+                "minikarte" : "angle"
+            }
+        },
+        {
+            "id" : "coordinates",
+            "type" : "hidden"
+        },
+		{
+    		"id" : "scale",
+    		"label" : "Maßstab",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"scale" : "value"
+    		}
+    	}
+    ],
+    "pages" : [
+        {
+            "tpl" : "../print/A4_landscape_template_pure_map.pdf",
+            "useTplPage" : 1,
+            "elements" : {
+                "karte" : {
+                    "type" : "map",
+                    "res_dpi" : 72,
+                    "x_ul" : 5.2,
+                    "y_ul" : 5.2,
+                    "width" : 286.5,
+                    "height" : 199.6,
+                    "coords" : 0,
+                    "coords_font_family" : "Arial",
+                    "coords_font_size" : 8
+                },
+				"messung" : {
+					"type" : "measure",
+					"do_fill" : 0,
+					"fill_color" : {
+						"r" : 255,
+						"g" : 0,
+						"b" : 0
+						},
+					"do_stroke" : 0,
+					"stroke_color" : {
+						"r" : 0,
+						"g" : 0,
+						"b" : 0
+						},
+					"line_style" : {
+						"width" : 1.0
+					}
+	   			}
+			}
+		}
+    ]
+}

Added: branches/2.7/http/print/A4_landscape_template_pure_map.odg
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A4_landscape_template_pure_map.odg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A4_landscape_template_pure_map.pdf
===================================================================
--- branches/2.7/http/print/A4_landscape_template_pure_map.pdf	                        (rev 0)
+++ branches/2.7/http/print/A4_landscape_template_pure_map.pdf	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,87 @@
+%PDF-1.4
+%äüöß
+2 0 obj
+<</Length 3 0 R/Filter/FlateDecode>>
+stream
+xœ]M
+Â@…÷9Å[Ét†NO ¸«.\wþ™
+í¦×73-’|á%/Š…&vÂ5¢wm0šo8Wx‘"Çü ÉFŠ^¹-œ°²]:ä«:н²³Ç}ù±XÌî‰ÊAœß~1íJÞ‰9jme$õæW8¡pˆÂ1ÿu
+7Ógoch uÔá
+á|-ú
+endstream
+endobj
+
+3 0 obj
+146
+endobj
+
+5 0 obj
+<<
+>>
+endobj
+
+6 0 obj
+<</Font 5 0 R
+/ProcSet[/PDF/Text]
+>>
+endobj
+
+1 0 obj
+<</Type/Page/Parent 4 0 R/Resources 6 0 R/MediaBox[0 0 842 595]/Group<</S/Transparency/CS/DeviceRGB/I true>>/Contents 2 0 R>>
+endobj
+
+7 0 obj
+<</Count 1/First 8 0 R/Last 8 0 R
+>>
+endobj
+
+8 0 obj
+<</Count 0/Title<FEFF0046006F006C0069006500200031>
+/Dest[1 0 R/XYZ 0 595 0]/Parent 7 0 R>>
+endobj
+
+4 0 obj
+<</Type/Pages
+/Resources 6 0 R
+/MediaBox[ 0 0 842 595 ]
+/Kids[ 1 0 R ]
+/Count 1>>
+endobj
+
+9 0 obj
+<</Type/Catalog/Pages 4 0 R
+/OpenAction[1 0 R /XYZ null null 0]
+/Outlines 7 0 R
+>>
+endobj
+
+10 0 obj
+<</Author<FEFF004A00F600720067002000540068006F006D00730065006E>
+/Creator<FEFF0044007200610077>
+/Producer<FEFF004F00700065006E004F00660066006900630065002E006F0072006700200033002E0032>
+/CreationDate(D:20110331094706+02'00')>>
+endobj
+
+xref
+0 11
+0000000000 65535 f 
+0000000331 00000 n 
+0000000019 00000 n 
+0000000236 00000 n 
+0000000633 00000 n 
+0000000256 00000 n 
+0000000278 00000 n 
+0000000473 00000 n 
+0000000526 00000 n 
+0000000731 00000 n 
+0000000830 00000 n 
+trailer
+<</Size 11/Root 9 0 R
+/Info 10 0 R
+/ID [ <60A04635E9EA6166F2E5679F10DBE4B3>
+<60A04635E9EA6166F2E5679F10DBE4B3> ]
+/DocChecksum /67B5C3D5165692A800418A599EE3353A
+>>
+startxref
+1071
+%%EOF

Added: branches/2.7/http/print/A4_portrait_official_template.json
===================================================================
--- branches/2.7/http/print/A4_portrait_official_template.json	                        (rev 0)
+++ branches/2.7/http/print/A4_portrait_official_template.json	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,170 @@
+{
+    "type" : "templatePDF",
+    "orientation" : "P",
+    "units" : "mm",
+    "format" : "a4",
+    "controls" : [
+        {
+            "id" : "title",
+            "label" : "Titel",
+            "type" : "text",
+            "size" : 20,
+            "pageElementsLink" : {
+                "titel" : "value"
+            }
+        },
+    	{
+    		"id" : "dpi",
+    		"label" : "DPI",
+    		"type" : "select",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"karte" : "res_dpi"
+    		},
+    		"options" : [
+    			{
+    			"value" : "288",
+    			"label" : "hoch (288 dpi)"
+    			},{
+    			"value" : "72",
+    			"label" : "normal (72 dpi)"
+    			}
+    		]
+    	},
+        {
+            "id" : "comment1",
+            "label" : "Kommentar 1 (40 Zeichen)",
+            "type" : "textarea",
+            "size" : 5,
+            "pageElementsLink" : {
+                "kommentar1" : "value"
+            }
+        },
+        {
+            "id" : "comment2",
+            "label" : "Kommentar 2 (40 Zeichen)",
+            "type" : "textarea",
+            "size" : 5,
+            "pageElementsLink" : {
+                "kommentar2" : "value"
+            }
+        },
+        {
+            "id" : "angle",
+            "label" : "Winkel",
+            "type" : "text",
+            "pageElementsLink" : {
+                "nordpfeil" : "angle",
+                "karte" : "angle",
+                "minikarte" : "angle"
+            }
+        },
+        {
+            "id" : "coordinates",
+            "type" : "hidden"
+        },
+        {
+            "id" : "scale",
+            "label" : "Maßstab",
+            "type" : "text",
+            "pageElementsLink" : {
+                "scale" : "value"
+            }
+        }
+    ],
+    "pages" : [
+        {
+            "tpl" : "../print/A4_portrait_official_template.pdf",
+            "useTplPage" : 1,
+            "elements" : {
+                "karte" : {
+                    "type" : "map",
+                    "res_dpi" : 72,
+                    "x_ul" : 25.2,
+                    "y_ul" : 10.2,
+                    "width" : 174.7,
+                    "height" : 247.6,
+                    "coords" : 1,
+                    "coords_font_family" : "Arial",
+                    "coords_font_size" : 7
+                },
+				"messung" : {
+					"type" : "measure",
+					"do_fill" : 0,
+					"fill_color" : {
+						"r" : 255,
+						"g" : 0,
+						"b" : 0
+						},
+					"do_stroke" : 0,
+					"stroke_color" : {
+						"r" : 0,
+						"g" : 0,
+						"b" : 0
+						},
+					"line_style" : {
+						"width" : 1.0
+    				}
+	   			},
+                "titel" : {
+                    "type" : "text",
+                    "x_ul" : 73,
+                    "y_ul" : 268.8,
+                    "font_family" : "Arial",
+                    "font_size" : 14
+                },
+                "scale" : {
+                    "type" : "text",
+                    "x_ul" : 148.4,
+                    "y_ul" : 271,
+                    "font_family" : "Arial",
+                    "font_size" : 12,
+                    "value" : "scale"
+                },
+                "date" : {
+                    "type" : "text",
+                    "x_ul" : 178.4,
+                    "y_ul" : 271,
+                    "font_family" : "Arial",
+                    "font_size" : 12,
+                    "value" : "date"
+                },
+                "nordpfeil" : {
+                    "type" : "image",
+                    "x_ul" : 29.3,
+                    "y_ul" : 271.5,
+                    "width" : 6,
+                    "height" : 12,
+                    "angle" : 0,
+                    "filename" : "../print/img/northarrow_simple.png"
+                },
+                "kommentar1" : {
+                    "type" : "para",
+                    "x_ul" : 39,
+                    "y_ul" : 269.8,
+                    "font_family" : "Arial",
+                    "font_size" : 12,
+                    "width" : 40,
+                    "height" : 5,
+                    "align" : "L",
+                    "border" : 0,
+                    "fill" : 1,
+                    "border_width" : 0.5
+                },
+                "kommentar2" : {
+                    "type" : "para",
+                    "x_ul" : 39,
+                    "y_ul" : 274.7,
+                    "font_family" : "Arial",
+                    "font_size" : 12,
+                    "width" : 40,
+                    "height" : 5,
+                    "align" : "L",
+                    "border" : 0,
+                    "fill" : 1,
+                    "border_width" : 0.5
+                }
+            }
+        }
+    ]
+}

Added: branches/2.7/http/print/A4_portrait_official_template.odg
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A4_portrait_official_template.odg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A4_portrait_official_template.pdf
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A4_portrait_official_template.pdf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A4_portrait_template_pure_map.json
===================================================================
--- branches/2.7/http/print/A4_portrait_template_pure_map.json	                        (rev 0)
+++ branches/2.7/http/print/A4_portrait_template_pure_map.json	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,85 @@
+{
+    "type" : "templatePDF",
+    "orientation" : "P",
+    "units" : "mm",
+    "format" : "a4",
+    "controls" : [
+    	{
+    		"id" : "dpi",
+    		"label" : "DPI",
+    		"type" : "select",
+    		"size" : 20,
+    		"pageElementsLink" : {
+    			"karte" : "res_dpi"
+    		},
+    		"options" : [
+    			{
+    			"value" : "288",
+    			"label" : "hoch (288 dpi)"
+    			},{
+    			"value" : "72",
+    			"label" : "normal (72 dpi)"
+    			}
+    		]
+    	},
+        {
+            "id" : "angle",
+            "label" : "Winkel",
+            "type" : "text",
+            "pageElementsLink" : {
+                "nordpfeil" : "angle",
+                "karte" : "angle",
+                "minikarte" : "angle"
+            }
+        },
+        {
+            "id" : "coordinates",
+            "type" : "hidden"
+        },
+		{
+    		"id" : "scale",
+    		"label" : "Maßstab",
+    		"type" : "text",
+    		"pageElementsLink" : {
+    			"scale" : "value"
+    		}
+    	}
+    ],
+    "pages" : [
+        {
+            "tpl" : "../print/A4_portrait_template_pure_map.pdf",
+            "useTplPage" : 1,
+            "elements" : {
+                "karte" : {
+                    "type" : "map",
+                    "res_dpi" : 72,
+                    "x_ul" : 5.2,
+                    "y_ul" : 5.2,
+                    "width" : 199.6,
+                    "height" : 286.5,
+                    "coords" : 0,
+                    "coords_font_family" : "Arial",
+                    "coords_font_size" : 8
+                },
+				"messung" : {
+					"type" : "measure",
+					"do_fill" : 0,
+					"fill_color" : {
+						"r" : 255,
+						"g" : 0,
+						"b" : 0
+						},
+					"do_stroke" : 0,
+					"stroke_color" : {
+						"r" : 0,
+						"g" : 0,
+						"b" : 0
+						},
+					"line_style" : {
+						"width" : 1.0
+    				}
+	   			}
+			}
+		}
+    ]
+}

Added: branches/2.7/http/print/A4_portrait_template_pure_map.odg
===================================================================
(Binary files differ)


Property changes on: branches/2.7/http/print/A4_portrait_template_pure_map.odg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.7/http/print/A4_portrait_template_pure_map.pdf
===================================================================
--- branches/2.7/http/print/A4_portrait_template_pure_map.pdf	                        (rev 0)
+++ branches/2.7/http/print/A4_portrait_template_pure_map.pdf	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,83 @@
+%PDF-1.4
+%äüöß
+2 0 obj
+<</Length 3 0 R/Filter/FlateDecode>>
+stream
+xœUŽ½Â0„÷{Š›;DŽIiúHl…±ñS¡‰.}}œ¤B +º‹>[œç‚7Å¢í[·aÊùÆSÃ<sÌHIOÈ-Z|bõb€”ÇW­µ÷R¨‡]Á/öö{òLïZÑ¿z±ÚÚwnKì†	&Z}bñQ;óÖèmÓÿoíû$Œ8bÀÀi,ó
+endstream
+endobj
+
+3 0 obj
+143
+endobj
+
+5 0 obj
+<<
+>>
+endobj
+
+6 0 obj
+<</Font 5 0 R
+/ProcSet[/PDF/Text]
+>>
+endobj
+
+1 0 obj
+<</Type/Page/Parent 4 0 R/Resources 6 0 R/MediaBox[0 0 595 842]/Group<</S/Transparency/CS/DeviceRGB/I true>>/Contents 2 0 R>>
+endobj
+
+7 0 obj
+<</Count 1/First 8 0 R/Last 8 0 R
+>>
+endobj
+
+8 0 obj
+<</Count 0/Title<FEFF0046006F006C0069006500200031>
+/Dest[1 0 R/XYZ 0 842 0]/Parent 7 0 R>>
+endobj
+
+4 0 obj
+<</Type/Pages
+/Resources 6 0 R
+/MediaBox[ 0 0 595 842 ]
+/Kids[ 1 0 R ]
+/Count 1>>
+endobj
+
+9 0 obj
+<</Type/Catalog/Pages 4 0 R
+/OpenAction[1 0 R /XYZ null null 0]
+/Outlines 7 0 R
+>>
+endobj
+
+10 0 obj
+<</Author<FEFF004A00F600720067002000540068006F006D00730065006E>
+/Creator<FEFF0044007200610077>
+/Producer<FEFF004F00700065006E004F00660066006900630065002E006F0072006700200033002E0032>
+/CreationDate(D:20110324153509+01'00')>>
+endobj
+
+xref
+0 11
+0000000000 65535 f 
+0000000328 00000 n 
+0000000019 00000 n 
+0000000233 00000 n 
+0000000630 00000 n 
+0000000253 00000 n 
+0000000275 00000 n 
+0000000470 00000 n 
+0000000523 00000 n 
+0000000728 00000 n 
+0000000827 00000 n 
+trailer
+<</Size 11/Root 9 0 R
+/Info 10 0 R
+/ID [ <D2B329ABACBEAB4AFE3200F133EADE57>
+<D2B329ABACBEAB4AFE3200F133EADE57> ]
+/DocChecksum /BBF379DCD86A2EBB902E440BC870A052
+>>
+startxref
+1068
+%%EOF

Modified: branches/2.7/resources/db/install.bat
===================================================================
--- branches/2.7/resources/db/install.bat	2011-05-27 13:42:59 UTC (rev 7835)
+++ branches/2.7/resources/db/install.bat	2011-05-27 13:56:15 UTC (rev 7836)
@@ -135,8 +135,10 @@
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6.1_to_2.6.2_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
 echo   update to 2.7rc1
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6.2_to_2.7rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
-echo   update to 2.7rc2
+echo   update to 2.7rc2 to 2.7.1
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.7rc1_to_2.7rc2_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
+echo   update to 2.7.2
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.7.1_to_2.7.22_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
 echo   update sequences
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_serial_set_sequences_2.7.sql %DBNAME% 1>> log_sequences.txt 2>> err_sequences.txt
 

Modified: branches/2.7/resources/db/install.sh
===================================================================
--- branches/2.7/resources/db/install.sh	2011-05-27 13:42:59 UTC (rev 7835)
+++ branches/2.7/resources/db/install.sh	2011-05-27 13:56:15 UTC (rev 7836)
@@ -138,6 +138,7 @@
       pgsql/$DBENCODING/update/update_2.6.1_to_2.6.2_pgsql_$DBENCODING.sql \
       pgsql/$DBENCODING/update/update_2.6.2_to_2.7rc1_pgsql_$DBENCODING.sql \
       pgsql/$DBENCODING/update/update_2.7rc1_to_2.7rc2_pgsql_$DBENCODING.sql \
+      pgsql/$DBENCODING/update/update_2.7.1_to_2.7.2_pgsql_$DBENCODING.sql \
       pgsql/pgsql_serial_set_sequences_2.7.sql \
 	> _install.sql
     echo "inserting data (this might take a while longer)"

Added: branches/2.7/resources/db/pgsql/UTF-8/update/update_2.7.1_to_2.7.2_pgsql_UTF-8.sql
===================================================================
--- branches/2.7/resources/db/pgsql/UTF-8/update/update_2.7.1_to_2.7.2_pgsql_UTF-8.sql	                        (rev 0)
+++ branches/2.7/resources/db/pgsql/UTF-8/update/update_2.7.1_to_2.7.2_pgsql_UTF-8.sql	2011-05-27 13:56:15 UTC (rev 7836)
@@ -0,0 +1,18 @@
+UPDATE gui_element_vars set 
+var_value =
+'{"A4 landscape": "A4_landscape_template.json","A4 portrait": "A4_portrait_template.json","A4 landscape": "A4_landscape_template.json",
+"A4 landscape official": "A4_landscape_official_template.json",
+"A4 portrait official": "A4_portrait_official_template.json",
+"A4 portrait (map only)": "A4_portrait_template_pure_map.json",
+"A3 landscape": "A3_landscape_template.json","A3 portrait": "A3_portrait_template.json",
+"A3 landscape official": "A3_landscape_official_template.json",
+"A3 portrait official": "A3_portrait_official_template.json",
+"A3 portrait (map only)": "A3_portrait_template_pure_map.json",
+"A2 landscape": "A2_landscape_template.json",
+"A1 landscape": "A1_landscape_template.json",
+"A0 landscape": "A0_landscape_template.json"
+}'
+where fkey_gui_id = 'template_print' and fkey_e_id = 'printPDF' and var_name = 'mbPrintConfig';
+
+UPDATE gui_element set e_width = 28, e_height = 28
+where fkey_gui_id = 'template_print' and e_id ='printButton' ;

Modified: branches/2.7/resources/db/update.bat
===================================================================
--- branches/2.7/resources/db/update.bat	2011-05-27 13:42:59 UTC (rev 7835)
+++ branches/2.7/resources/db/update.bat	2011-05-27 13:56:15 UTC (rev 7836)
@@ -108,9 +108,11 @@
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6.1_to_2.6.2_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
 echo   update to 2.7rc1
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6.2_to_2.7rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
-echo   update to 2.7rc2
-psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.7rc1_to_2.7rc2_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
-echo   update to 2.7
+echo   update to 2.7rc2 to 2.7.1
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.7rc1_to_2.7rc2_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
+echo   update to 2.7.2
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.7.1_to_2.7.2_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
+echo   update sequences
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_serial_set_sequences_2.7.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
 
 

Modified: branches/2.7/resources/db/update.sh
===================================================================
--- branches/2.7/resources/db/update.sh	2011-05-27 13:42:59 UTC (rev 7835)
+++ branches/2.7/resources/db/update.sh	2011-05-27 13:56:15 UTC (rev 7836)
@@ -99,8 +99,10 @@
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.6.1_to_2.6.2_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
 	echo "update to 2.7rc1"
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.6.2_to_2.7rc1_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
-    echo "update to 2.7rc2"
+    echo "update to 2.7rc2 to 2.7.1"
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.7rc1_to_2.7rc2_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
+    echo "update to 2.7.2"
+	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.7.1_to_2.7.2_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
     echo "update sequences"
     psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/pgsql_serial_set_sequences_2.7.sql $DBNAME >> log_update.txt 2>> err_update.txt
 



More information about the Mapbender_commits mailing list