From 3af9347e47302e3f6754cba8ea2b63772980a5d9 Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 9 Mar 2020 16:15:19 -0700 Subject: Rework tosca converter Fix the tosca converter template to support json instead of properties file. Issue-ID: CLAMP-253 Signed-off-by: sebdet Change-Id: Id4f839d0b5bfece519b0b1e615e8d6e14e464f16 --- docs/swagger/swagger.json | 292 +++++++++++++++++++++++----------------------- docs/swagger/swagger.pdf | 102 ++++++++-------- 2 files changed, 197 insertions(+), 197 deletions(-) (limited to 'docs') diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index e35fba278..3b34182c1 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -4,13 +4,13 @@ "version" : "5.0.0-SNAPSHOT", "title" : "Clamp Rest API" }, - "host" : "localhost:40597", + "host" : "localhost:39237", "basePath" : "/restservices/clds/", "schemes" : [ "http" ], "paths" : { "/v2/dictionary" : { "get" : { - "operationId" : "route80", + "operationId" : "route49", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -20,11 +20,11 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route80" + "x-camelContextId" : "camel-2", + "x-routeId" : "route49" }, "put" : { - "operationId" : "route82", + "operationId" : "route51", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -43,8 +43,8 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route82" + "x-camelContextId" : "camel-2", + "x-routeId" : "route51" } }, "/v2/dictionary/{dictionaryName}" : { @@ -64,7 +64,7 @@ } } }, - "x-camelContextId" : "camel-3", + "x-camelContextId" : "camel-2", "x-routeId" : null } }, @@ -93,11 +93,11 @@ } } }, - "x-camelContextId" : "camel-3", + "x-camelContextId" : "camel-2", "x-routeId" : null }, "delete" : { - "operationId" : "route84", + "operationId" : "route53", "produces" : [ "application/json" ], "parameters" : [ { "name" : "name", @@ -108,8 +108,8 @@ "responses" : { "200" : { } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route84" + "x-camelContextId" : "camel-2", + "x-routeId" : "route53" } }, "/v2/dictionary/{name}/elements/{shortName}" : { @@ -129,7 +129,7 @@ "responses" : { "200" : { } }, - "x-camelContextId" : "camel-3", + "x-camelContextId" : "camel-2", "x-routeId" : null } }, @@ -147,13 +147,13 @@ } } }, - "x-camelContextId" : "camel-3", + "x-camelContextId" : "camel-2", "x-routeId" : null } }, "/v2/loop/{loopName}" : { "get" : { - "operationId" : "route65", + "operationId" : "route34", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -169,13 +169,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route65" + "x-camelContextId" : "camel-2", + "x-routeId" : "route34" } }, "/v2/loop/delete/{loopName}" : { "put" : { - "operationId" : "route76", + "operationId" : "route45", "parameters" : [ { "name" : "loopName", "in" : "path", @@ -185,13 +185,13 @@ "responses" : { "200" : { } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route76" + "x-camelContextId" : "camel-2", + "x-routeId" : "route45" } }, "/v2/loop/deploy/{loopName}" : { "put" : { - "operationId" : "route70", + "operationId" : "route39", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -207,13 +207,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route70" + "x-camelContextId" : "camel-2", + "x-routeId" : "route39" } }, "/v2/loop/getAllNames" : { "get" : { - "operationId" : "route64", + "operationId" : "route33", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -226,13 +226,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route64" + "x-camelContextId" : "camel-2", + "x-routeId" : "route33" } }, "/v2/loop/getstatus/{loopName}" : { "get" : { - "operationId" : "route77", + "operationId" : "route46", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -248,13 +248,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route77" + "x-camelContextId" : "camel-2", + "x-routeId" : "route46" } }, "/v2/loop/refreshOpPolicyJsonSchema/{loopName}" : { "put" : { - "operationId" : "route71", + "operationId" : "route40", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -270,13 +270,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route71" + "x-camelContextId" : "camel-2", + "x-routeId" : "route40" } }, "/v2/loop/restart/{loopName}" : { "put" : { - "operationId" : "route74", + "operationId" : "route43", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -292,13 +292,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route74" + "x-camelContextId" : "camel-2", + "x-routeId" : "route43" } }, "/v2/loop/stop/{loopName}" : { "put" : { - "operationId" : "route73", + "operationId" : "route42", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -314,13 +314,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route73" + "x-camelContextId" : "camel-2", + "x-routeId" : "route42" } }, "/v2/loop/submit/{loopName}" : { "put" : { - "operationId" : "route75", + "operationId" : "route44", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -336,13 +336,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route75" + "x-camelContextId" : "camel-2", + "x-routeId" : "route44" } }, "/v2/loop/svgRepresentation/{loopName}" : { "get" : { - "operationId" : "route66", + "operationId" : "route35", "produces" : [ "application/xml" ], "parameters" : [ { "name" : "loopName", @@ -358,13 +358,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route66" + "x-camelContextId" : "camel-2", + "x-routeId" : "route35" } }, "/v2/loop/undeploy/{loopName}" : { "put" : { - "operationId" : "route72", + "operationId" : "route41", "produces" : [ "application/json" ], "parameters" : [ { "name" : "loopName", @@ -380,13 +380,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route72" + "x-camelContextId" : "camel-2", + "x-routeId" : "route41" } }, "/v2/loop/updateGlobalProperties/{loopName}" : { "post" : { - "operationId" : "route67", + "operationId" : "route36", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -410,13 +410,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route67" + "x-camelContextId" : "camel-2", + "x-routeId" : "route36" } }, "/v2/loop/updateMicroservicePolicy/{loopName}" : { "post" : { - "operationId" : "route69", + "operationId" : "route38", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -440,13 +440,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route69" + "x-camelContextId" : "camel-2", + "x-routeId" : "route38" } }, "/v2/loop/updateOperationalPolicies/{loopName}" : { "post" : { - "operationId" : "route68", + "operationId" : "route37", "consumes" : [ "application/json" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -470,13 +470,13 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route68" + "x-camelContextId" : "camel-2", + "x-routeId" : "route37" } }, "/v2/policyToscaModels" : { "get" : { - "operationId" : "route87", + "operationId" : "route56", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -486,8 +486,8 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route87" + "x-camelContextId" : "camel-2", + "x-routeId" : "route56" } }, "/v2/policyToscaModels/{policyModelType}" : { @@ -507,11 +507,11 @@ } } }, - "x-camelContextId" : "camel-3", + "x-camelContextId" : "camel-2", "x-routeId" : null }, "put" : { - "operationId" : "route88", + "operationId" : "route57", "consumes" : [ "plain/text" ], "produces" : [ "application/json" ], "parameters" : [ { @@ -535,8 +535,8 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route88" + "x-camelContextId" : "camel-2", + "x-routeId" : "route57" } }, "/v2/policyToscaModels/yaml/{policyModelType}" : { @@ -556,13 +556,13 @@ } } }, - "x-camelContextId" : "camel-3", + "x-camelContextId" : "camel-2", "x-routeId" : null } }, "/v2/templates" : { "get" : { - "operationId" : "route91", + "operationId" : "route60", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -572,8 +572,8 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route91" + "x-camelContextId" : "camel-2", + "x-routeId" : "route60" } }, "/v2/templates/{templateName}" : { @@ -593,7 +593,7 @@ } } }, - "x-camelContextId" : "camel-3", + "x-camelContextId" : "camel-2", "x-routeId" : null } }, @@ -611,13 +611,13 @@ } } }, - "x-camelContextId" : "camel-3", + "x-camelContextId" : "camel-2", "x-routeId" : null } }, "/v1/healthcheck" : { "get" : { - "operationId" : "route92", + "operationId" : "route61", "produces" : [ "application/json" ], "responses" : { "200" : { @@ -627,19 +627,19 @@ } } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route92" + "x-camelContextId" : "camel-2", + "x-routeId" : "route61" } }, "/v1/user/getUser" : { "get" : { - "operationId" : "route93", + "operationId" : "route62", "produces" : [ "text/plain" ], "responses" : { "200" : { } }, - "x-camelContextId" : "camel-3", - "x-routeId" : "route93" + "x-camelContextId" : "camel-2", + "x-routeId" : "route62" } } }, @@ -803,6 +803,21 @@ "JsonPrimitive" : { "type" : "object", "properties" : { + "asInt" : { + "type" : "integer", + "format" : "int32" + }, + "asDouble" : { + "type" : "number", + "format" : "double" + }, + "asLong" : { + "type" : "integer", + "format" : "int64" + }, + "boolean" : { + "type" : "boolean" + }, "asBoolean" : { "type" : "boolean" }, @@ -815,22 +830,10 @@ "asNumber" : { "$ref" : "#/definitions/Number" }, - "asDouble" : { - "type" : "number", - "format" : "double" - }, "asFloat" : { "type" : "number", "format" : "float" }, - "asLong" : { - "type" : "integer", - "format" : "int64" - }, - "asInt" : { - "type" : "integer", - "format" : "int32" - }, "asByte" : { "type" : "string", "format" : "byte" @@ -848,20 +851,17 @@ "type" : "integer", "format" : "int32" }, - "boolean" : { - "type" : "boolean" - }, "string" : { "type" : "boolean" }, - "jsonObject" : { - "type" : "boolean" + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" }, "asJsonArray" : { "$ref" : "#/definitions/JsonArray" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "jsonObject" : { + "type" : "boolean" }, "jsonArray" : { "type" : "boolean" @@ -952,14 +952,20 @@ "JsonObject" : { "type" : "object", "properties" : { - "asBoolean" : { - "type" : "boolean" + "asInt" : { + "type" : "integer", + "format" : "int32" }, - "jsonObject" : { - "type" : "boolean" + "asDouble" : { + "type" : "number", + "format" : "double" }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" + "asLong" : { + "type" : "integer", + "format" : "int64" + }, + "asBoolean" : { + "type" : "boolean" }, "asJsonObject" : { "$ref" : "#/definitions/JsonObject" @@ -967,6 +973,12 @@ "asString" : { "type" : "string" }, + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" + }, + "jsonObject" : { + "type" : "boolean" + }, "jsonArray" : { "type" : "boolean" }, @@ -985,22 +997,10 @@ "asNumber" : { "$ref" : "#/definitions/Number" }, - "asDouble" : { - "type" : "number", - "format" : "double" - }, "asFloat" : { "type" : "number", "format" : "float" }, - "asLong" : { - "type" : "integer", - "format" : "int64" - }, - "asInt" : { - "type" : "integer", - "format" : "int32" - }, "asByte" : { "type" : "string", "format" : "byte" @@ -1153,14 +1153,20 @@ "JsonNull" : { "type" : "object", "properties" : { - "asBoolean" : { - "type" : "boolean" + "asInt" : { + "type" : "integer", + "format" : "int32" }, - "jsonObject" : { - "type" : "boolean" + "asDouble" : { + "type" : "number", + "format" : "double" }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" + "asLong" : { + "type" : "integer", + "format" : "int64" + }, + "asBoolean" : { + "type" : "boolean" }, "asJsonObject" : { "$ref" : "#/definitions/JsonObject" @@ -1168,6 +1174,12 @@ "asString" : { "type" : "string" }, + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" + }, + "jsonObject" : { + "type" : "boolean" + }, "jsonArray" : { "type" : "boolean" }, @@ -1186,22 +1198,10 @@ "asNumber" : { "$ref" : "#/definitions/Number" }, - "asDouble" : { - "type" : "number", - "format" : "double" - }, "asFloat" : { "type" : "number", "format" : "float" }, - "asLong" : { - "type" : "integer", - "format" : "int64" - }, - "asInt" : { - "type" : "integer", - "format" : "int32" - }, "asByte" : { "type" : "string", "format" : "byte" @@ -1224,6 +1224,18 @@ "JsonArray" : { "type" : "object", "properties" : { + "asInt" : { + "type" : "integer", + "format" : "int32" + }, + "asDouble" : { + "type" : "number", + "format" : "double" + }, + "asLong" : { + "type" : "integer", + "format" : "int64" + }, "asBoolean" : { "type" : "boolean" }, @@ -1233,22 +1245,10 @@ "asNumber" : { "$ref" : "#/definitions/Number" }, - "asDouble" : { - "type" : "number", - "format" : "double" - }, "asFloat" : { "type" : "number", "format" : "float" }, - "asLong" : { - "type" : "integer", - "format" : "int64" - }, - "asInt" : { - "type" : "integer", - "format" : "int32" - }, "asByte" : { "type" : "string", "format" : "byte" @@ -1266,14 +1266,14 @@ "type" : "integer", "format" : "int32" }, - "jsonObject" : { - "type" : "boolean" + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" }, "asJsonArray" : { "$ref" : "#/definitions/JsonArray" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "jsonObject" : { + "type" : "boolean" }, "jsonArray" : { "type" : "boolean" diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf index b97c2cfd4..a1d7b18d8 100644 --- a/docs/swagger/swagger.pdf +++ b/docs/swagger/swagger.pdf @@ -4,8 +4,8 @@ << /Title (Clamp Rest API) /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) -/CreationDate (D:20200309090008-07'00') -/ModDate (D:20200309090008-07'00') +/CreationDate (D:20200309160816-07'00') +/ModDate (D:20200309160816-07'00') >> endobj 2 0 obj @@ -5910,7 +5910,7 @@ ET BT 71.30850000000001 592.176 Td /F1.0 10.5 Tf -<203a206c6f63616c686f73743a3430353937> Tj +<203a206c6f63616c686f73743a3339323337> Tj ET 0.000 0.000 0.000 SCN @@ -10857,8 +10857,8 @@ endobj [72 0 R /XYZ 0 108.12000000000052 null] endobj 82 0 obj -<< /Limits [(_route77) (_version_information)] -/Names [(_route77) 94 0 R (_route80) 37 0 R (_route82) 41 0 R (_route84) 69 0 R (_route87) 169 0 R (_route88) 184 0 R (_route91) 193 0 R (_route92) 29 0 R (_route93) 34 0 R (_service) 303 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 179 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 173 0 R (_v2_templates_names_get) 198 0 R (_v2_templates_templatename_get) 201 0 R (_version_information) 23 0 R] +<< /Limits [(_route46) (_version_information)] +/Names [(_route46) 94 0 R (_route49) 37 0 R (_route51) 41 0 R (_route53) 69 0 R (_route56) 169 0 R (_route57) 184 0 R (_route60) 193 0 R (_route61) 29 0 R (_route62) 34 0 R (_service) 303 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 179 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 173 0 R (_v2_templates_names_get) 198 0 R (_v2_templates_templatename_get) 201 0 R (_version_information) 23 0 R] >> endobj 83 0 obj @@ -14929,8 +14929,8 @@ endobj [110 0 R /XYZ 0 481.68000000000046 null] endobj 116 0 obj -<< /Limits [(_responses_5) (_route76)] -/Names [(_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route64) 91 0 R (_route65) 162 0 R (_route66) 126 0 R (_route67) 138 0 R (_route68) 154 0 R (_route69) 145 0 R (_route70) 85 0 R (_route71) 101 0 R (_route72) 131 0 R (_route73) 113 0 R (_route74) 106 0 R (_route75) 119 0 R (_route76) 79 0 R] +<< /Limits [(_responses_5) (_route45)] +/Names [(_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route33) 91 0 R (_route34) 162 0 R (_route35) 126 0 R (_route36) 138 0 R (_route37) 154 0 R (_route38) 145 0 R (_route39) 85 0 R (_route40) 101 0 R (_route41) 131 0 R (_route42) 113 0 R (_route43) 106 0 R (_route44) 119 0 R (_route45) 79 0 R] >> endobj 117 0 obj @@ -45551,7 +45551,7 @@ endobj endobj 314 0 obj << /Border [0 0 0] -/Dest (_route92) +/Dest (_route61) /Subtype /Link /Rect [60.24000000000001 621.7799999999997 181.64100000000002 636.0599999999998] /Type /Annot @@ -45559,7 +45559,7 @@ endobj endobj 315 0 obj << /Border [0 0 0] -/Dest (_route92) +/Dest (_route61) /Subtype /Link /Rect [557.8905 621.7799999999997 563.76 636.0599999999998] /Type /Annot @@ -45599,7 +45599,7 @@ endobj endobj 320 0 obj << /Border [0 0 0] -/Dest (_route93) +/Dest (_route62) /Subtype /Link /Rect [60.24000000000001 566.3399999999997 183.8775 580.6199999999998] /Type /Annot @@ -45607,7 +45607,7 @@ endobj endobj 321 0 obj << /Border [0 0 0] -/Dest (_route93) +/Dest (_route62) /Subtype /Link /Rect [557.8905 566.3399999999997 563.76 580.6199999999998] /Type /Annot @@ -45647,7 +45647,7 @@ endobj endobj 326 0 obj << /Border [0 0 0] -/Dest (_route80) +/Dest (_route49) /Subtype /Link /Rect [60.24000000000001 510.89999999999975 172.716 525.1799999999997] /Type /Annot @@ -45655,7 +45655,7 @@ endobj endobj 327 0 obj << /Border [0 0 0] -/Dest (_route80) +/Dest (_route49) /Subtype /Link /Rect [557.8905 510.89999999999975 563.76 525.1799999999997] /Type /Annot @@ -45695,7 +45695,7 @@ endobj endobj 332 0 obj << /Border [0 0 0] -/Dest (_route82) +/Dest (_route51) /Subtype /Link /Rect [60.24000000000001 455.4599999999997 172.548 469.73999999999967] /Type /Annot @@ -45703,7 +45703,7 @@ endobj endobj 333 0 obj << /Border [0 0 0] -/Dest (_route82) +/Dest (_route51) /Subtype /Link /Rect [557.8905 455.4599999999997 563.76 469.73999999999967] /Type /Annot @@ -45967,7 +45967,7 @@ endobj endobj 366 0 obj << /Border [0 0 0] -/Dest (_route84) +/Dest (_route53) /Subtype /Link /Rect [60.24000000000001 141.29999999999953 232.70250000000001 155.57999999999953] /Type /Annot @@ -45975,7 +45975,7 @@ endobj endobj 367 0 obj << /Border [0 0 0] -/Dest (_route84) +/Dest (_route53) /Subtype /Link /Rect [557.8905 141.29999999999953 563.76 155.57999999999953] /Type /Annot @@ -46095,7 +46095,7 @@ endobj endobj 382 0 obj << /Border [0 0 0] -/Dest (_route76) +/Dest (_route45) /Subtype /Link /Rect [60.24000000000001 704.7599999999999 245.15550000000002 719.04] /Type /Annot @@ -46103,7 +46103,7 @@ endobj endobj 383 0 obj << /Border [0 0 0] -/Dest (_route76) +/Dest (_route45) /Subtype /Link /Rect [557.8905 704.7599999999999 563.76 719.04] /Type /Annot @@ -46143,7 +46143,7 @@ endobj endobj 388 0 obj << /Border [0 0 0] -/Dest (_route70) +/Dest (_route39) /Subtype /Link /Rect [60.24000000000001 649.3199999999998 248.431294921875 663.5999999999999] /Type /Annot @@ -46151,7 +46151,7 @@ endobj endobj 389 0 obj << /Border [0 0 0] -/Dest (_route70) +/Dest (_route39) /Subtype /Link /Rect [557.8905 649.3199999999998 563.76 663.5999999999999] /Type /Annot @@ -46207,7 +46207,7 @@ endobj endobj 396 0 obj << /Border [0 0 0] -/Dest (_route64) +/Dest (_route33) /Subtype /Link /Rect [60.24000000000001 575.3999999999997 214.8735 589.6799999999998] /Type /Annot @@ -46215,7 +46215,7 @@ endobj endobj 397 0 obj << /Border [0 0 0] -/Dest (_route64) +/Dest (_route33) /Subtype /Link /Rect [557.8905 575.3999999999997 563.76 589.6799999999998] /Type /Annot @@ -46255,7 +46255,7 @@ endobj endobj 402 0 obj << /Border [0 0 0] -/Dest (_route77) +/Dest (_route46) /Subtype /Link /Rect [60.24000000000001 519.9599999999998 259.467 534.2399999999998] /Type /Annot @@ -46263,7 +46263,7 @@ endobj endobj 403 0 obj << /Border [0 0 0] -/Dest (_route77) +/Dest (_route46) /Subtype /Link /Rect [557.8905 519.9599999999998 563.76 534.2399999999998] /Type /Annot @@ -46319,7 +46319,7 @@ endobj endobj 410 0 obj << /Border [0 0 0] -/Dest (_route71) +/Dest (_route40) /Subtype /Link /Rect [60.24000000000001 446.03999999999974 355.8885 460.3199999999997] /Type /Annot @@ -46327,7 +46327,7 @@ endobj endobj 411 0 obj << /Border [0 0 0] -/Dest (_route71) +/Dest (_route40) /Subtype /Link /Rect [557.8905 446.03999999999974 563.76 460.3199999999997] /Type /Annot @@ -46383,7 +46383,7 @@ endobj endobj 418 0 obj << /Border [0 0 0] -/Dest (_route74) +/Dest (_route43) /Subtype /Link /Rect [60.24000000000001 372.11999999999966 248.45250000000001 386.39999999999964] /Type /Annot @@ -46391,7 +46391,7 @@ endobj endobj 419 0 obj << /Border [0 0 0] -/Dest (_route74) +/Dest (_route43) /Subtype /Link /Rect [557.8905 372.11999999999966 563.76 386.39999999999964] /Type /Annot @@ -46447,7 +46447,7 @@ endobj endobj 426 0 obj << /Border [0 0 0] -/Dest (_route73) +/Dest (_route42) /Subtype /Link /Rect [60.24000000000001 298.1999999999996 235.842 312.47999999999956] /Type /Annot @@ -46455,7 +46455,7 @@ endobj endobj 427 0 obj << /Border [0 0 0] -/Dest (_route73) +/Dest (_route42) /Subtype /Link /Rect [557.8905 298.1999999999996 563.76 312.47999999999956] /Type /Annot @@ -46511,7 +46511,7 @@ endobj endobj 434 0 obj << /Border [0 0 0] -/Dest (_route75) +/Dest (_route44) /Subtype /Link /Rect [60.24000000000001 224.27999999999952 249.70200000000003 238.55999999999952] /Type /Annot @@ -46519,7 +46519,7 @@ endobj endobj 435 0 obj << /Border [0 0 0] -/Dest (_route75) +/Dest (_route44) /Subtype /Link /Rect [557.8905 224.27999999999952 563.76 238.55999999999952] /Type /Annot @@ -46575,7 +46575,7 @@ endobj endobj 442 0 obj << /Border [0 0 0] -/Dest (_route66) +/Dest (_route35) /Subtype /Link /Rect [60.24000000000001 150.35999999999956 307.641 164.63999999999956] /Type /Annot @@ -46583,7 +46583,7 @@ endobj endobj 443 0 obj << /Border [0 0 0] -/Dest (_route66) +/Dest (_route35) /Subtype /Link /Rect [557.8905 150.35999999999956 563.76 164.63999999999956] /Type /Annot @@ -46639,7 +46639,7 @@ endobj endobj 450 0 obj << /Border [0 0 0] -/Dest (_route72) +/Dest (_route41) /Subtype /Link /Rect [60.24000000000001 76.4399999999996 261.860794921875 90.7199999999996] /Type /Annot @@ -46647,7 +46647,7 @@ endobj endobj 451 0 obj << /Border [0 0 0] -/Dest (_route72) +/Dest (_route41) /Subtype /Link /Rect [557.8905 76.4399999999996 563.76 90.7199999999996] /Type /Annot @@ -46703,7 +46703,7 @@ endobj endobj 458 0 obj << /Border [0 0 0] -/Dest (_route67) +/Dest (_route36) /Subtype /Link /Rect [60.24000000000001 704.7599999999999 339.560794921875 719.04] /Type /Annot @@ -46711,7 +46711,7 @@ endobj endobj 459 0 obj << /Border [0 0 0] -/Dest (_route67) +/Dest (_route36) /Subtype /Link /Rect [552.021 704.7599999999999 563.76 719.04] /Type /Annot @@ -46783,7 +46783,7 @@ endobj endobj 468 0 obj << /Border [0 0 0] -/Dest (_route69) +/Dest (_route38) /Subtype /Link /Rect [60.24000000000001 612.3599999999998 350.38629492187505 626.6399999999999] /Type /Annot @@ -46791,7 +46791,7 @@ endobj endobj 469 0 obj << /Border [0 0 0] -/Dest (_route69) +/Dest (_route38) /Subtype /Link /Rect [552.021 612.3599999999998 563.76 626.6399999999999] /Type /Annot @@ -46863,7 +46863,7 @@ endobj endobj 478 0 obj << /Border [0 0 0] -/Dest (_route68) +/Dest (_route37) /Subtype /Link /Rect [60.24000000000001 519.9599999999998 352.81158984375 534.2399999999998] /Type /Annot @@ -46871,7 +46871,7 @@ endobj endobj 479 0 obj << /Border [0 0 0] -/Dest (_route68) +/Dest (_route37) /Subtype /Link /Rect [552.021 519.9599999999998 563.76 534.2399999999998] /Type /Annot @@ -46943,7 +46943,7 @@ endobj endobj 488 0 obj << /Border [0 0 0] -/Dest (_route65) +/Dest (_route34) /Subtype /Link /Rect [60.24000000000001 427.5599999999997 212.0595 441.8399999999997] /Type /Annot @@ -46951,7 +46951,7 @@ endobj endobj 489 0 obj << /Border [0 0 0] -/Dest (_route65) +/Dest (_route34) /Subtype /Link /Rect [552.021 427.5599999999997 563.76 441.8399999999997] /Type /Annot @@ -47007,7 +47007,7 @@ endobj endobj 496 0 obj << /Border [0 0 0] -/Dest (_route87) +/Dest (_route56) /Subtype /Link /Rect [60.24000000000001 353.63999999999965 221.091755859375 367.9199999999996] /Type /Annot @@ -47015,7 +47015,7 @@ endobj endobj 497 0 obj << /Border [0 0 0] -/Dest (_route87) +/Dest (_route56) /Subtype /Link /Rect [552.021 353.63999999999965 563.76 367.9199999999996] /Type /Annot @@ -47183,7 +47183,7 @@ endobj endobj 518 0 obj << /Border [0 0 0] -/Dest (_route88) +/Dest (_route57) /Subtype /Link /Rect [60.24000000000001 150.35999999999956 318.73125585937504 164.63999999999956] /Type /Annot @@ -47191,7 +47191,7 @@ endobj endobj 519 0 obj << /Border [0 0 0] -/Dest (_route88) +/Dest (_route57) /Subtype /Link /Rect [552.021 150.35999999999956 563.76 164.63999999999956] /Type /Annot @@ -47263,7 +47263,7 @@ endobj endobj 528 0 obj << /Border [0 0 0] -/Dest (_route91) +/Dest (_route60) /Subtype /Link /Rect [60.24000000000001 57.95999999999961 175.8555 72.23999999999961] /Type /Annot @@ -47271,7 +47271,7 @@ endobj endobj 529 0 obj << /Border [0 0 0] -/Dest (_route91) +/Dest (_route60) /Subtype /Link /Rect [552.021 57.95999999999961 563.76 72.23999999999961] /Type /Annot -- cgit 1.2.3-korg