Changeset 5038 for extensions/AMetaData/JpegMetaData/TagDefinitions/NikonTags.class.php

Timestamp:

Mar 3, 2010, 9:55:15 PM (14 years ago)

Author:

grum

Message:

Manage multiple lenses for one Id for Pentax camera
Add some minors features

File:

• extensions/AMetaData/JpegMetaData/TagDefinitions/NikonTags.class.php (modified) (7 diffs)

extensions/AMetaData/JpegMetaData/TagDefinitions/NikonTags.class.php

@@ -679 +679 @@
         'tagName'     => "LensData",
         'schema'      => "Nikon",
-        'translatable'=> true,
+        'translatable'=> false,
         'combiTag'    => 0,
         'implemented' => true,
@@ -734 +734 @@
           '2D 48 80 80 30 30 21 02' => 'AF Micro-Nikkor 200mm f/4D IF-ED',
           '2E 48 5C 82 30 3C 28 02' => 'AF Nikkor 70-210mm f/4-5.6D',
-          '2F 48 30 44 24 24 29 02' => 'AF Zoom-Nikkor 20-35mm f/2.8D IF',  //doublon?
+          '2F 48 30 44 24 24 29 02' => Array(
+            /*
+             * Different lenses can have the same Id.
+             * The Nikon Id are made with the focal min/max and the aperture
+             * min/max values.
+             *
+             * So, it's not possible to apply the method used with the Canon
+             * lens Id.
+             *
+             * For multiple lenses with the same key, the method used is to
+             * return the first lens
+             */
+                                          'AF Zoom-Nikkor 20-35mm f/2.8D IF',
+                                          'Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)',
+                                       ),
           '30 48 98 98 24 24 24 02' => 'AF-I Nikkor 400mm f/2.8D IF-ED',
           '30 48 98 98 24 24 F1 02' => 'AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E',
@@ -740 +754 @@
           '30 48 98 98 24 24 F2 02' => 'AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E',
           '31 54 56 56 24 24 25 02' => 'AF Micro-Nikkor 60mm f/2.8D',
-          '32 54 6A 6A 24 24 35 02' => 'AF Micro-Nikkor 105mm f/2.8D', //doublon?
+
+          '32 54 6A 6A 24 24 35 02' => Array(
+                                          'AF Micro-Nikkor 105mm f/2.8D',
+                                          'Sigma Macro 105mm f/2.8 EX DG',
+                                       ),
           '33 48 2D 2D 24 24 31 02' => 'AF Nikkor 18mm f/2.8D',
           '34 48 29 29 24 24 32 02' => 'AF Fisheye Nikkor 16mm f/2.8D',
@@ -816 +834 @@
           '78 40 37 6E 2C 3C 7C 0E' => 'AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED',
           '79 40 3C 80 2C 3C 7F 06' => 'AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED',
-          '7A 3C 1F 37 30 30 7E 06' => 'AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED', //doublon ?
+          '7A 3C 1F 37 30 30 7E 06' => Array(
+                                        'AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED',
+                                        'Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)',
+                                       ),
           '7B 48 80 98 30 30 80 0E' => 'AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED',
           '7D 48 2B 53 24 24 82 06' => 'AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED',
@@ -874 +895 @@
           '79 48 5C 5C 24 24 1C 06' => 'Sigma Macro 70mm F2.8 EX DG',
           '02 48 65 65 24 24 02 00' => 'Sigma 90mm F2.8 Macro',
-          '32 54 6A 6A 24 24 35 02' => 'Sigma Macro 105mm F2.8 EX DG', //doublon ?
           'E5 54 6A 6A 24 24 35 02' => 'Sigma Macro 105mm F2.8 EX DG',
           '48 48 76 76 24 24 4B 06' => 'Sigma 150mm F2.8 EX DG APO Macro HSM',
@@ -1005 +1025 @@
           '00 48 1C 29 24 24 00 06' => 'Tokina AT-X 116 PRO DX (AF 11-16mm f/2.8)',
           '00 3C 1F 37 30 30 00 06' => 'Tokina AT-X 124 AF PRO DX (AF 12-24mm f/4)',
-          '7A 3C 1F 37 30 30 7E 06' => 'Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)', //doublon ?
           '00 48 29 50 24 24 00 06' => 'Tokina AT-X 165 PRO DX (AF 16-50mm f/2.8)',
           '00 40 2A 72 2C 3C 00 06' => 'Tokina AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)',
-          '2F 48 30 44 24 24 29 02' => 'Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)', //doublon ?
           '2F 40 30 44 2C 34 29 02' => 'Tokina AF 235 II (AF 20-35mm f/3.5-4.5)',
           '25 48 3C 5C 24 24 1B 02' => 'Tokina AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)',
@@ -1081 +1099 @@
       // SerialNumber, tag 0x00a0
       0x00a0 => Array(
-        'tagName'     => "SerialNumber",
+        'tagName'     => "SerialNumber2",
         'schema'      => "Nikon",
         'translatable'=> false,