Commit 90829793 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 2.5.0~beta2+dfsg

parent ae718f59
This diff is collapsed.
PostGIS 2.5.0beta2
2018/08/11
New since PostGIS 2.5.0beta1
- #4115, Fix a bug that created MVTs with incorrect property values under
parallel plans (Raúl Marín).
- #4120, ST_AsMVTGeom: Clip using tile coordinates (Raúl Marín).
- #4132, ST_Intersection on Raster now works without throwing TopologyException
(Vinícius A.B. Schmidt, Darafei Praliaskouski)
- #4109, Fix WKT parser accepting and interpreting numbers with
multiple dots (Raúl Marín, Paul Ramsey)
- #4140, Use user-provided CFLAGS in address standardizer and the
topology module (Raúl Marín)
- #4143, Fix backend crash when ST_OffsetCurve fails (Dan Baston)
- #4145, Speedup MVT column parsing (Raúl Marín)
See PostGIS 2.5.0 section for full details
PostGIS 2.5.0beta1
2018/07/03
New since PostGIS 2.5.0alpha
......@@ -76,12 +94,8 @@ PostGIS 2.5.0
- #2508, ST_OffsetCurve now works with collections (Darafei Praliaskouski)
- #4006, ST_GeomFromGeoJSON support for json and jsonb as input
(Paul Ramsey, Regina Obe)
- #4037, Invalid input geometry is fixed with MakeValid for GEOS exceptions in
ST_Intersection, ST_Union, ST_Difference, ST_SymDifference (Darafei
Praliaskouski)
- #4038, ST_Subdivide now selects pivot for geometry split that reuses input
vertices. ST_ClipByBox2D is stubbed with ST_Intersection because of
robustness issues. (Darafei Praliaskouski)
vertices. (Darafei Praliaskouski)
- #4025, #4032 Fixed precision issue in ST_ClosestPointOfApproach,
ST_DistanceCPA, and ST_CPAWithin (Paul Ramsey, Darafei Praliaskouski)
- #4076, Reduce use of GEOS in topology implementation (Björn Harrtell)
......@@ -91,7 +105,11 @@ PostGIS 2.5.0
- #4084: Fixed wrong code-comment regarding front/back of BOX3D (Matthias Bay)
- #4060, #4094, PostgreSQL JIT support (Raúl Marín, Laurenz Albe)
- #3960, ST_Centroid now uses lwgeom_centroid (Darafei Praliaskouski)
- #4103, ST_PointOnSurface can handle invalid (Darafei Praliaskouski)
- #4027, Remove duplicated code in lwgeom_geos (Darafei Praliaskouski,
Daniel Baston)
- #4115, Fix a bug that created MVTs with incorrect property values under
parallel plans (Raúl Marín).
- #4120, ST_AsMVTGeom: Clip using tile coordinates (Raúl Marín).
PostGIS 2.4.4
2018/04/08
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 2.5.0
:Date: 2018-xx-xx
:Version: 2.5.0beta2
:Date: 2018-08-11
:Website: http://postgis.net
This distribution contains a module which implements GIS simple features, ties
......
......@@ -5,7 +5,7 @@
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=5
POSTGIS_MICRO_VERSION=0beta1
POSTGIS_MICRO_VERSION=0beta2
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
......
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -12,7 +12,7 @@
# PARTICULAR PURPOSE.
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
......@@ -62,7 +62,7 @@ fi
--with-pgconfig=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}/bin/pg_config \
--with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config \
--with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin/gdal-config \
--without-interrupt-tests \
--with-sfcgal=/usr/bin/sfcgal-config --without-interrupt-tests \
--prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
make clean
make
......
......@@ -17369,9 +17369,6 @@ if test "x$with_topology" != "xno"; then
TOPOLOGY="topology"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: TOPOLOGY: Topology support requested" >&5
$as_echo "TOPOLOGY: Topology support requested" >&6; }
if test "$GEOS_NUMERIC_VERSION" -lt 30302; then
as_fn_error $? "Topology requires GEOS version >= 3.3.2. Use --without-topology or install a newer GEOS." "$LINENO" 5
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: TOPOLOGY: Topology support disabled" >&5
$as_echo "TOPOLOGY: Topology support disabled" >&6; }
......@@ -17864,7 +17861,7 @@ fi
ac_config_files="$ac_config_files GNUmakefile extensions/Makefile extensions/postgis/Makefile extensions/postgis_sfcgal/Makefile extensions/postgis_topology/Makefile extensions/postgis_tiger_geocoder/Makefile extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control extensions/address_standardizer/Makefile liblwgeom/Makefile liblwgeom/cunit/Makefile liblwgeom/liblwgeom.h libpgcommon/Makefile libpgcommon/cunit/Makefile postgis/Makefile postgis/sqldefines.h loader/Makefile loader/cunit/Makefile topology/Makefile topology/test/Makefile regress/Makefile doc/Makefile doc/Makefile.comments doc/html/image_src/Makefile utils/Makefile $RT_MAKEFILE_LIST"
ac_config_files="$ac_config_files GNUmakefile extensions/Makefile extensions/postgis/Makefile extensions/postgis_sfcgal/Makefile extensions/postgis_topology/Makefile extensions/postgis_tiger_geocoder/Makefile extensions/address_standardizer/Makefile liblwgeom/Makefile liblwgeom/cunit/Makefile liblwgeom/liblwgeom.h libpgcommon/Makefile libpgcommon/cunit/Makefile postgis/Makefile postgis/sqldefines.h loader/Makefile loader/cunit/Makefile topology/Makefile topology/test/Makefile regress/Makefile doc/Makefile doc/Makefile.comments doc/html/image_src/Makefile utils/Makefile $RT_MAKEFILE_LIST"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -18866,7 +18863,6 @@ do
"extensions/postgis_sfcgal/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/postgis_sfcgal/Makefile" ;;
"extensions/postgis_topology/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/postgis_topology/Makefile" ;;
"extensions/postgis_tiger_geocoder/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/postgis_tiger_geocoder/Makefile" ;;
"extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control") CONFIG_FILES="$CONFIG_FILES extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control" ;;
"extensions/address_standardizer/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/address_standardizer/Makefile" ;;
"liblwgeom/Makefile") CONFIG_FILES="$CONFIG_FILES liblwgeom/Makefile" ;;
"liblwgeom/cunit/Makefile") CONFIG_FILES="$CONFIG_FILES liblwgeom/cunit/Makefile" ;;
......
......@@ -1181,9 +1181,6 @@ if test "x$with_topology" != "xno"; then
TOPOLOGY="topology"
AC_MSG_RESULT([TOPOLOGY: Topology support requested])
if test "$GEOS_NUMERIC_VERSION" -lt 30302; then
AC_MSG_ERROR([Topology requires GEOS version >= 3.3.2. Use --without-topology or install a newer GEOS.])
fi
else
AC_MSG_RESULT([TOPOLOGY: Topology support disabled])
fi
......@@ -1459,7 +1456,6 @@ AC_OUTPUT([GNUmakefile
extensions/postgis_sfcgal/Makefile
extensions/postgis_topology/Makefile
extensions/postgis_tiger_geocoder/Makefile
extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control
extensions/address_standardizer/Makefile
liblwgeom/Makefile
liblwgeom/cunit/Makefile
......
......@@ -781,6 +781,7 @@ TMPDIR="/gisdata/temp/"
UNZIPTOOL=unzip
WGETTOOL="/usr/bin/wget"
export PGBIN=/usr/lib/postgresql/9.4/bin
-- variables used by psql: https://www.postgresql.org/docs/current/static/libpq-envars.html
export PGPORT=5432
export PGHOST=localhost
export PGUSER=postgres
......
......@@ -156,8 +156,7 @@ SELECT MAX(ST_NPoints(geom)) FROM sometable;</programlisting>
For geometry: Connect to your database with
<filename>psql</filename> and try the following SQL:</para>
<programlisting>CREATE TABLE gtest ( gid serial primary key, name varchar(20)
, geom geometry(LINESTRING) );</programlisting>
<programlisting>CREATE TABLE gtest (id serial primary key, name varchar(20), geom geometry(LINESTRING));</programlisting>
<para>If the geometry column definition fails, you probably have not
loaded the PostGIS functions and objects into this database or are using a pre-2.0 version of PostGIS. See the
......
......@@ -3,21 +3,7 @@
<title>PostGIS Raster Frequently Asked Questions</title>
<qandaset>
<qandaentry id="faq_security_change_1">
<question>
<para>I'm getting error <code>ERROR: RASTER_fromGDALRaster: Could not open bytea with GDAL. Check that the bytea is of a GDAL supported format.</code> when using ST_FromGDALRaster
or <code>ERROR: rt_raster_to_gdal: Could not load the output GDAL driver</code> when trying to use ST_AsPNG or other raster input functions.</para>
</question>
<answer>
<para>As of PostGIS 2.1.3 and 2.0.5, a security change was made to by default disable all GDAL drivers and out of db rasters. The release notes are at <ulink url="http://postgis.net/2014/05/19/postgis-2.0.6_and_2.1.3">PostGIS 2.0.6, 2.1.3 security release</ulink>. In order to reenable specific drivers or all drivers and reenable out of database support, refer to <xref linkend="install_short_version" />.</para>
</answer>
</qandaentry>
<qandaentry>
<qandaentry>
<question>
<para>Where can I find out more about the PostGIS Raster Project?</para>
</question>
......@@ -37,7 +23,7 @@
Jorge has a series of blog articles on PostGIS Raster that demonstrate how to load raster data as well as cross compare to same tasks in Oracle GeoRaster. Check out
<ulink url="http://gis4free.wordpress.com/category/postgis-raster/">Jorge's PostGIS Raster / Oracle GeoRaster Series</ulink>.
There is a whole chapter (more than 35 pages of content) dedicated to PostGIS Raster with free code and data downloads at <ulink url="https://www.manning.com/books/postgis-in-action-second-edition">PostGIS in Action - Raster chapter</ulink>.
You can <ulink url="http://www.postgis.us/page_buy_book">buy PostGIS in Action</ulink> now from Manning in hard-copy (significant discounts for bulk purchases) or just the E-book format.
You can <ulink url="http://www.postgis.us/page_buy_book">buy PostGIS in Action</ulink> now from Manning in hard-copy (significant discounts for bulk purchases) or just the E-book format.
You can also buy from Amazon and various other book distributors. All hard-copy books come with a free coupon to download the E-book version.
</para>
<para>Here is a review from a PostGIS Raster user <ulink url="http://fuzzytolerance.info/blog/2010/10/26/2010-10-26-postgis-raster-ftw/">PostGIS raster applied to land classification urban forestry</ulink></para>
......@@ -51,8 +37,7 @@
</question>
<answer>
<para>The easiest is to download binaries for PostGIS and Raster which are currently available for windows and latest versions of Mac OSX.
First you need a working PostGIS 2.0.0 or above and be running PostgreSQL 8.4, 9.0, or 9.1. Note in PostGIS 2.0 PostGIS Raster is fully integrated, so it will be compiled when you compile PostGIS.</para>
<para>Starting with PostGIS 2.0 PostGIS Raster is fully integrated, so it will be compiled when you compile PostGIS.</para>
<para>Instructions for installing and running under windows are available at <ulink url="http://gis4free.wordpress.com/2011/03/10/how-to-install-and-configure-postgis-raster-on-windows/">How to Install and Configure PostGIS raster on windows</ulink></para>
<para>
If you are on windows, you can compile yourself, or use the <ulink
......@@ -60,8 +45,7 @@
PostGIS Raster windows binaries</ulink>.
If you are on Mac OSX Leopard or Snow Leopard, there are binaries available at <ulink url="http://www.kyngchaos.com/software/postgres">Kyng Chaos Mac OSX PostgreSQL/GIS binaries</ulink>.
</para>
<para>Then to enable raster support in your database, run the rtpostgis.sql file in your database. To upgrade an existing install use rtpostgis_upgrade_minor..sql instead of rtpostgis.sql</para>
<para>For other platforms, you generally need to compile yourself. Dependencies are PostGIS and GDAL. For more details about compiling from source, please refer to <ulink url="http://trac.osgeo.org/postgis/wiki/WKTRaster/Documentation01#a2.3-CompilingandInstallingfromSources">Installing PostGIS Raster from source (in prior versions of PostGIS)</ulink></para>
<para>For other platforms, install PostGIS from your software repository. For more details about compiling from source, please refer to <ulink url="http://trac.osgeo.org/postgis/wiki/WKTRaster/Documentation01#a2.3-CompilingandInstallingfromSources">Installing PostGIS Raster from source</ulink></para>
</answer>
</qandaentry>
......@@ -85,7 +69,7 @@
</question>
<answer>
<para>The latest version of PostGIS comes packaged with a <varname>raster2pgsql</varname> raster loader executable capable of loading many kinds of rasters and also generating lower resolution overviews without any additional software. Please refer to <xref linkend="RT_Raster_Loader" /> for more details. Pre-2.0 versions came with a <varname>raster2pgsql.py</varname> that required python with numpy and GDAL. This is no longer needed.</para>
<para>The latest version of PostGIS comes packaged with a <varname>raster2pgsql</varname> raster loader executable capable of loading many kinds of rasters and also generating lower resolution overviews without any additional software. Please refer to <xref linkend="RT_Raster_Loader" /> for more details.</para>
</answer>
</qandaentry>
......@@ -108,7 +92,7 @@
<answer>
<para>Yes</para>
<para>GDAL 1.7+ has a PostGIS raster driver, but is only compiled in if you choose to compile with PostgreSQL support. </para>
<para>GDAL has a PostGIS raster driver, but is only compiled in if you choose to compile with PostgreSQL support. </para>
<para>The driver currently doesn't support irregularly blocked rasters,
although you can store irregularly blocked rasters in PostGIS raster data type.</para>
<para>If you are compiling from source, you need to include in your configure
......@@ -158,7 +142,7 @@
</question>
<answer>
<para>You can use MapServer compiled with GDAL 1.7+ and PostGIS Raster driver support to view Raster data. QuantumGIS (QGIS) now supports viewing of PostGIS Raster if you
<para>You can use MapServer compiled with GDAL 1.7+ and PostGIS Raster driver support to view Raster data. QGIS supports viewing of PostGIS Raster if you
have PostGIS raster driver installed.</para>
<para>In theory any tool that renders data using GDAL can support PostGIS raster data or
support it with fairly minimal effort. Again for Windows, Tamas' binaries <ulink url="www.gisinternals.com">http://www.gisinternals.com</ulink> are a good choice if you don't want the hassle of having to setup to compile your own.</para>
......@@ -298,5 +282,17 @@ END
</answer>
</qandaentry>
<qandaentry id="faq_security_change_1">
<question>
<para>I'm getting error <code>ERROR: RASTER_fromGDALRaster: Could not open bytea with GDAL. Check that the bytea is of a GDAL supported format.</code> when using ST_FromGDALRaster
or <code>ERROR: rt_raster_to_gdal: Could not load the output GDAL driver</code> when trying to use ST_AsPNG or other raster input functions.</para>
</question>
<answer>
<para>As of PostGIS 2.1.3 and 2.0.5, a security change was made to by default disable all GDAL drivers and out of db rasters. The release notes are at <ulink url="http://postgis.net/2014/05/19/postgis-2.0.6_and_2.1.3">PostGIS 2.0.6, 2.1.3 security release</ulink>. In order to reenable specific drivers or all drivers and reenable out of database support, refer to <xref linkend="install_short_version" />.</para>
</answer>
</qandaentry>
</qandaset>
</chapter>
......@@ -205,3 +205,4 @@ distclean: clean
images-clean:
rm -f $(IMAGES) $(IMAGES_RESIZED)
.NOTPARALLEL:
......@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: PostGIS\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-09-14 18:44+0000\n"
"PO-Revision-Date: 2017-09-14 19:09+0000\n"
"Last-Translator: Regina Obe\n"
"PO-Revision-Date: 2018-07-23 18:01+0000\n"
"Last-Translator: Andreas Schild <andreas.schild@bfw.gv.at>\n"
"Language-Team: German (http://www.transifex.com/postgis/postgis/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -412,7 +412,7 @@ msgid ""
"For any given hierarchical TopoGeometry all child TopoGeometry elements will"
" come from the same child layer, as specified in the topology.layer record "
"for the layer of the TopoGeometry being defined."
msgstr ""
msgstr "Bei jeder gegebenen hierarchischen TopoGeometry werden alle Kindklassen der TopoGeometrie vom selben Kindlayer abgeleitet, so wie dies in dem Datensatz von \"topology.layer\" für den Layer der TopoGeometry definiert ist."
#. Tag: title
#: extras_topology.xml:162 extras_topology.xml:190 extras_topology.xml:281
......@@ -2368,7 +2368,7 @@ msgstr "-- Einen alleinstehenden Knoten, ohne Masche, entfernen --\nSELECT topo
#: extras_topology.xml:1626
#, no-c-format
msgid "ST_RemoveIsoEdge"
msgstr ""
msgstr "ST_RemoveIsoEdge"
#. Tag: refpurpose
#: extras_topology.xml:1628
......@@ -2376,7 +2376,7 @@ msgstr ""
msgid ""
"<refpurpose>Removes an isolated edge and returns description of action. If "
"the edge is not isolated, then an exception is thrown.</refpurpose>"
msgstr ""
msgstr "<refpurpose>Löscht einen isolierten Knoten und gibt eine Beschreibung der getroffenen Maßnahmen aus. Falls der Knoten nicht isoliert ist, wird eine Fehlermeldung ausgegeben.</refpurpose>"
#. Tag: funcprototype
#: extras_topology.xml:1633
......@@ -2385,7 +2385,7 @@ msgid ""
"<funcdef>text <function>ST_RemoveIsoEdge</function></funcdef> "
"<paramdef><type>varchar </type> <parameter>atopology</parameter></paramdef> "
"<paramdef><type>integer </type> <parameter>anedge</parameter></paramdef>"
msgstr ""
msgstr "<funcdef>text <function>ST_RemoveIsoEdge</function></funcdef> <paramdef><type>varchar </type> <parameter>atopology</parameter></paramdef> <paramdef><type>integer </type> <parameter>anedge</parameter></paramdef>"
#. Tag: para
#: extras_topology.xml:1644
......@@ -2393,7 +2393,7 @@ msgstr ""
msgid ""
"<para>Removes an isolated edge and returns description of action. If the "
"edge is not isolated, then an exception is thrown.</para>"
msgstr ""
msgstr "<para>Löscht einen isolierten Knoten und gibt eine Beschreibung der getroffenen Maßnahmen aus. Falls der Knoten nicht isoliert ist, wird eine Fehlermeldung ausgegeben.</para>"
#. Tag: title
#: extras_topology.xml:1668
......@@ -3040,7 +3040,7 @@ msgid ""
"value 1. A positive edge starts at the given node. A negative edge ends into"
" the given node. Closed edges will appear twice (with both signs). Order is "
"clockwise starting from northbound."
msgstr ""
msgstr "Gibt für einen Knoten die sortierte Menge der einfallenden Kanten aus. Jede Ausgabe besteht aus einer Sequenz und einer mit Vorzeichen versehenen ID für die Kante. Die Sequenz beginnt mit dem Wert 1. Eine Kante mit positiver ID beginnt an dem gegebenen Knoten. Eine negative Kante endet in dem gegebenen Knoten. Geschlossene Kanten kommen zweimal vor (mit beiden Vorzeichen). Die Sortierung geschieht von Norden ausgehend im Uhrzeigersinn."
#. Tag: para
#: extras_topology.xml:2138
......@@ -4209,7 +4209,7 @@ msgid ""
"<varname>element_type</varname> and <varname>element_id</varname>, in that "
"order. Such index would be created automatically by adding a unique "
"constraint to the fields. Example:"
msgstr ""
msgstr "Wenn der Parameter <varname>visitedTable</varname> angegeben ist, dann wird dieser verwendet um die bereits besuchten Knoten und Kanten über Querverweise (xlink:xref) zu verfolgen, anstatt Definitionen zu vervielfältigen. Die Tabelle muss (zumindest) zwei Integerfelder enthalten: 'element_type' und 'element_id'. Für den Aufruf muss der Anwender sowohl Lese- als auch Schreibrechte auf die Tabelle besitzen. Um die maximale Rechenleistung zu erreichen, sollte ein Index für die Attribute <varname>element_type</varname> und <varname>element_id</varname> - in dieser Reihenfolge - festgelegt werden. Dieser Index wird automatisch erstellt, wenn auf die Attribute ein Unique Constraint gelegt wird. Beispiel:"
#. Tag: programlisting
#: extras_topology.xml:2962
......
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.